diff --git a/checkin_notes b/checkin_notes index a855fab312..a56217bdf6 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10521,3 +10521,26 @@ David 12 Aug 2005 gui_rpc_client.h gui_rpc_client_ops.C util.C + +Rom 13 Aug 2005 + - Make building with libcurl the default on Windows. + - Add the zlib library to the build environment since curl relies + on it. + + clientgui/ + BOINCGUI.pjd + WizAttachProject.cpp, .h + curl/win32/x86/bin/ + libcurl.dll + curl/win32/x86/lib/ + libcurl.lib + lib/ + boinc_win.h + win_build/ + boinc.sln + boinc_cli_curl.vcproj + boinc_mgr_curl.vcproj + win_build/installerv2/ + BOINC.ism + zlib/ + diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index 0ead13198a..f4cea46c05 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 337 + 334 TRUE FALSE @@ -163,7 +163,7 @@ <None> - 15094976 + 14626944 data-document @@ -174,14 +174,14 @@ 0 Configurations - 32821256 + 52221232 config-data-document 0 1 0 - 15094976 + 14626944 0 TRUE @@ -229,7 +229,7 @@ Projects - 15072136 + 14634464 root-document project @@ -240,25 +240,25 @@ 0 Windows - 15092104 + 15094720 html-document dialogsfolder 1 1 0 - 15072136 + 14634464 1 Options - 15066168 + 15098160 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 8/3/2004 wbDialogProxy @@ -317,14 +317,14 @@ wxBoxSizer V - 15283936 + 14610448 dialog-control-document sizer 0 1 0 - 15066168 + 15098160 0 wbBoxSizerProxy Vertical @@ -343,14 +343,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 15242832 + 14679696 dialog-control-document notebook 0 1 0 - 15283936 + 14610448 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -406,14 +406,14 @@ wxPanel: ID_GENERAL - 15135472 + 14654624 dialog-control-document panel 0 1 0 - 15242832 + 14679696 0 wbPanelProxy ID_GENERAL @@ -466,14 +466,14 @@ wxBoxSizer V - 15155280 + 14701968 dialog-control-document sizer 0 1 0 - 15135472 + 14654624 0 24/9/2004 wbBoxSizerProxy @@ -493,14 +493,14 @@ <Any platform> wxFlexGridSizer - 15136368 + 14688368 dialog-control-document sizer 0 1 0 - 15155280 + 14701968 0 22/5/2005 wbFlexGridSizerProxy @@ -525,14 +525,14 @@ FALSE wxStaticText: wxID_STATIC - 15174352 + 14739616 dialog-control-document statictext 0 1 0 - 15136368 + 14688368 0 22/5/2005 wbStaticTextProxy @@ -582,14 +582,14 @@ wxComboBox: ID_LANGUAGESELECTION - 32694576 + 14742560 dialog-control-document combobox 0 1 0 - 15136368 + 14688368 0 22/5/2005 wbComboBoxProxy @@ -634,14 +634,14 @@ wxStaticText: wxID_STATIC - 32687752 + 14771120 dialog-control-document statictext 0 1 0 - 15136368 + 14688368 0 22/5/2005 wbStaticTextProxy @@ -691,14 +691,14 @@ wxSlider: ID_REMINDERFREQUENCY - 32612528 + 14748464 dialog-control-document slider 0 1 0 - 15136368 + 14688368 0 22/5/2005 wbSliderProxy @@ -758,14 +758,14 @@ wxPanel: ID_CONNECTONS - 15070240 + 14792736 dialog-control-document panel 0 1 0 - 15242832 + 14679696 0 27/5/2005 wbPanelProxy @@ -819,14 +819,14 @@ wxBoxSizer V - 32221584 + 14771488 dialog-control-document sizer 0 1 0 - 15070240 + 14792736 0 27/5/2005 wbBoxSizerProxy @@ -846,14 +846,14 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 31965192 + 14836960 dialog-control-document radiobutton 0 1 0 - 32221584 + 14771488 0 27/5/2005 wbRadioButtonProxy @@ -898,14 +898,14 @@ wxRadioButton: ID_NETWORKLAN - 32570112 + 14821120 dialog-control-document radiobutton 0 1 0 - 32221584 + 14771488 0 27/5/2005 wbRadioButtonProxy @@ -950,14 +950,14 @@ wxRadioButton: ID_NETWORKDIALUP - 15574320 + 14858608 dialog-control-document radiobutton 0 1 0 - 32221584 + 14771488 0 27/5/2005 wbRadioButtonProxy @@ -1002,14 +1002,14 @@ wxStaticBoxSizer V - 32800168 + 14869776 dialog-control-document sizer 0 1 0 - 32221584 + 14771488 0 27/5/2005 wbStaticBoxSizerProxy @@ -1033,14 +1033,14 @@ <Any platform> wxFlexGridSizer - 32672832 + 14839568 dialog-control-document sizer 0 1 0 - 32800168 + 14869776 0 27/5/2005 wbFlexGridSizerProxy @@ -1065,14 +1065,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 32614344 + 14898240 dialog-control-document listbox 0 1 0 - 32672832 + 14839568 0 27/5/2005 wbListBoxProxy @@ -1126,14 +1126,14 @@ wxBoxSizer V - 32594656 + 14899280 dialog-control-document sizer 0 1 0 - 32672832 + 14839568 0 27/5/2005 wbBoxSizerProxy @@ -1153,14 +1153,14 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 32824664 + 14935168 dialog-control-document dialogcontrol 0 1 0 - 32594656 + 14899280 0 27/5/2005 wbButtonProxy @@ -1206,14 +1206,14 @@ wxButton: ID_DIALUPCLEARDEFAULT - 32716184 + 14919088 dialog-control-document dialogcontrol 0 1 0 - 32594656 + 14899280 0 27/5/2005 wbButtonProxy @@ -1261,14 +1261,14 @@ wxFlexGridSizer - 15388176 + 14966976 dialog-control-document sizer 0 1 0 - 32800168 + 14869776 0 27/5/2005 wbFlexGridSizerProxy @@ -1293,14 +1293,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 15395152 + 14954560 dialog-control-document statictext 0 1 0 - 15388176 + 14966976 0 27/5/2005 wbStaticTextProxy @@ -1350,14 +1350,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 15410640 + 14958128 dialog-control-document statictext 0 1 0 - 15388176 + 14966976 0 27/5/2005 wbStaticTextProxy @@ -1408,14 +1408,14 @@ wxFlexGridSizer - 15426856 + 15054912 dialog-control-document sizer 0 1 0 - 32800168 + 14869776 0 28/5/2005 wbFlexGridSizerProxy @@ -1440,14 +1440,14 @@ FALSE wxCheckBox: ID_DIALUPPROMPTUSERNAMEPASSWORD - 15434304 + 15042736 dialog-control-document checkbox 0 1 0 - 15426856 + 15054912 0 28/5/2005 wbCheckBoxProxy @@ -1496,14 +1496,14 @@ wxPanel: ID_HTTPPROXY - 15154744 + 15159376 dialog-control-document panel 0 1 0 - 15242832 + 14679696 0 wbPanelProxy ID_HTTPPROXY @@ -1556,14 +1556,14 @@ wxBoxSizer V - 15461392 + 14689904 dialog-control-document sizer 0 1 0 - 15154744 + 15159376 0 wbBoxSizerProxy Vertical @@ -1582,14 +1582,14 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 15469224 + 15055952 dialog-control-document checkbox 0 1 0 - 15461392 + 14689904 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick @@ -1635,14 +1635,14 @@ wxStaticBoxSizer V - 15483608 + 15189904 dialog-control-document sizer 0 1 0 - 15461392 + 14689904 0 wbStaticBoxSizerProxy wxID_ANY @@ -1665,14 +1665,14 @@ <Any platform> wxGridSizer - 15491904 + 15179248 dialog-control-document sizer 0 1 0 - 15483608 + 15189904 0 wbGridSizerProxy 1 @@ -1694,14 +1694,14 @@ FALSE wxFlexGridSizer - 15500864 + 39517968 dialog-control-document sizer 0 1 0 - 15491904 + 15179248 0 wbFlexGridSizerProxy @@ -1725,14 +1725,14 @@ FALSE wxStaticText: wxID_STATIC - 15511392 + 39509488 dialog-control-document statictext 0 1 0 - 15500864 + 39517968 0 wbStaticTextProxy wxID_STATIC @@ -1781,14 +1781,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 15528360 + 39486384 dialog-control-document textctrl 0 1 0 - 15500864 + 39517968 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1848,14 +1848,14 @@ wxStaticText: wxID_STATIC - 15548440 + 38542064 dialog-control-document statictext 0 1 0 - 15500864 + 39517968 0 wbStaticTextProxy wxID_STATIC @@ -1904,14 +1904,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 15564720 + 38649056 dialog-control-document textctrl 0 1 0 - 15500864 + 39517968 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1973,14 +1973,14 @@ wxStaticBoxSizer V - 31854600 + 38789888 dialog-control-document sizer 0 1 0 - 15483608 + 15189904 0 wbStaticBoxSizerProxy wxID_ANY @@ -2003,14 +2003,14 @@ <Any platform> wxFlexGridSizer - 31861440 + 38779136 dialog-control-document sizer 0 1 0 - 31854600 + 38789888 0 wbFlexGridSizerProxy @@ -2034,14 +2034,14 @@ FALSE wxStaticText: wxID_STATIC - 31869296 + 38766432 dialog-control-document statictext 0 1 0 - 31861440 + 38779136 0 wbStaticTextProxy wxID_STATIC @@ -2092,14 +2092,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 31886496 + 38814256 dialog-control-document textctrl 0 1 0 - 31861440 + 38779136 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -2159,14 +2159,14 @@ wxStaticText: wxID_STATIC - 31906872 + 38854416 dialog-control-document statictext 0 1 0 - 31861440 + 38779136 0 wbStaticTextProxy wxID_STATIC @@ -2217,14 +2217,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 31927576 + 38835520 dialog-control-document textctrl 0 1 0 - 31861440 + 38779136 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2289,14 +2289,14 @@ wxPanel: ID_SOCKSPROXY - 32672448 + 38878992 dialog-control-document panel 0 1 0 - 15242832 + 14679696 0 wbPanelProxy ID_SOCKSPROXY @@ -2351,14 +2351,14 @@ FALSE wxBoxSizer V - 31959640 + 38857504 dialog-control-document sizer 0 1 0 - 32672448 + 38878992 0 wbBoxSizerProxy Vertical @@ -2377,14 +2377,14 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 31971240 + 38952240 dialog-control-document checkbox 0 1 0 - 31959640 + 38857504 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick @@ -2430,14 +2430,14 @@ wxStaticBoxSizer V - 31985712 + 38954480 dialog-control-document sizer 0 1 0 - 31959640 + 38857504 0 wbStaticBoxSizerProxy wxID_ANY @@ -2460,14 +2460,14 @@ <Any platform> wxGridSizer - 31994008 + 39026064 dialog-control-document sizer 0 1 0 - 31985712 + 38954480 0 wbGridSizerProxy 1 @@ -2489,14 +2489,14 @@ FALSE wxFlexGridSizer - 32002976 + 39015648 dialog-control-document sizer 0 1 0 - 31994008 + 39026064 0 wbFlexGridSizerProxy @@ -2520,14 +2520,14 @@ FALSE wxStaticText: wxID_STATIC - 32013600 + 39002928 dialog-control-document statictext 0 1 0 - 32002976 + 39015648 0 wbStaticTextProxy wxID_STATIC @@ -2578,14 +2578,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 32030896 + 39077632 dialog-control-document textctrl 0 1 0 - 32002976 + 39015648 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2647,14 +2647,14 @@ wxStaticText: wxID_STATIC - 32051600 + 39081952 dialog-control-document statictext 0 1 0 - 32002976 + 39015648 0 wbStaticTextProxy wxID_STATIC @@ -2705,14 +2705,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 32068272 + 39168672 dialog-control-document textctrl 0 1 0 - 32002976 + 39015648 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2776,14 +2776,14 @@ wxStaticBoxSizer V - 32089072 + 39207616 dialog-control-document sizer 0 1 0 - 31985712 + 38954480 0 wbStaticBoxSizerProxy wxID_ANY @@ -2806,14 +2806,14 @@ <Any platform> wxFlexGridSizer - 32095992 + 39205088 dialog-control-document sizer 0 1 0 - 32089072 + 39207616 0 wbFlexGridSizerProxy @@ -2837,14 +2837,14 @@ FALSE wxStaticText: wxID_STATIC - 32103880 + 39026448 dialog-control-document statictext 0 1 0 - 32095992 + 39205088 0 wbStaticTextProxy wxID_STATIC @@ -2895,14 +2895,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 32121184 + 39273120 dialog-control-document textctrl 0 1 0 - 32095992 + 39205088 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2964,14 +2964,14 @@ wxStaticText: wxID_STATIC - 32141928 + 39316384 dialog-control-document statictext 0 1 0 - 32095992 + 39205088 0 wbStaticTextProxy wxID_STATIC @@ -3022,14 +3022,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 32158536 + 39293072 dialog-control-document textctrl 0 1 0 - 32095992 + 39205088 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -3097,14 +3097,14 @@ wxBoxSizer H - 15066928 + 39339136 dialog-control-document sizer 0 1 0 - 15283936 + 14610448 0 wbBoxSizerProxy Horizontal @@ -3123,14 +3123,14 @@ <Any platform> wxButton: wxID_OK - 31970552 + 39328496 dialog-control-document dialogcontrol 0 1 0 - 15066928 + 39339136 0 wbButtonProxy wxID_OK @@ -3174,14 +3174,14 @@ wxButton: wxID_CANCEL - 32190560 + 39293824 dialog-control-document dialogcontrol 0 1 0 - 15066928 + 39339136 0 wbButtonProxy wxID_CANCEL @@ -3228,14 +3228,14 @@ About BOINC - 32203576 + 39440016 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 9/3/2004 wbDialogProxy @@ -3295,14 +3295,14 @@ wxBoxSizer V - 32217768 + 39339760 dialog-control-document sizer 0 1 0 - 32203576 + 39440016 0 wbBoxSizerProxy Vertical @@ -3321,14 +3321,14 @@ <Any platform> wxStaticText: wxID_STATIC - 32229232 + 39546896 dialog-control-document statictext 0 1 0 - 32217768 + 39339760 0 wbStaticTextProxy wxID_STATIC @@ -3377,14 +3377,14 @@ wxBoxSizer H - 32245544 + 39548928 dialog-control-document sizer 0 1 0 - 32217768 + 39339760 0 wbBoxSizerProxy Horizontal @@ -3403,14 +3403,14 @@ <Any platform> wxBoxSizer V - 32251976 + 39521280 dialog-control-document sizer 0 1 0 - 32245544 + 39548928 0 wbBoxSizerProxy Vertical @@ -3429,14 +3429,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 32261160 + 52217040 dialog-control-document staticbitmap 0 1 0 - 32251976 + 39521280 0 wbStaticBitmapProxy wxID_STATIC @@ -3480,14 +3480,14 @@ wxFlexGridSizer - 32274848 + 15143840 dialog-control-document sizer 0 1 0 - 32245544 + 39548928 0 wbFlexGridSizerProxy @@ -3511,14 +3511,14 @@ FALSE wxStaticText: wxID_STATIC - 32283264 + 39522384 dialog-control-document statictext 0 1 0 - 32274848 + 15143840 0 wbStaticTextProxy wxID_STATIC @@ -3567,14 +3567,14 @@ wxStaticText: wxID_STATIC - 32299592 + 14992064 dialog-control-document statictext 0 1 0 - 32274848 + 15143840 0 wbStaticTextProxy wxID_STATIC @@ -3623,14 +3623,14 @@ wxStaticText: wxID_STATIC - 32315944 + 38579952 dialog-control-document statictext 0 1 0 - 32274848 + 15143840 0 wbStaticTextProxy wxID_STATIC @@ -3679,14 +3679,14 @@ wxStaticText: wxID_STATIC - 32332288 + 38594320 dialog-control-document statictext 0 1 0 - 32274848 + 15143840 0 wbStaticTextProxy wxID_STATIC @@ -3739,14 +3739,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 32348496 + 15023888 dialog-control-document statictext 0 1 0 - 32217768 + 39339760 0 wbStaticTextProxy wxID_STATIC @@ -3797,14 +3797,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 32364016 + 15038080 dialog-control-document statictext 0 1 0 - 32217768 + 39339760 0 wbStaticTextProxy wxID_STATIC @@ -3855,14 +3855,14 @@ All Rights Reserved. wxHyperLink: ID_ABOUTBOINCLINK - 32379584 + 38615936 dialog-control-document foreign 0 1 0 - 32217768 + 39339760 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -3915,14 +3915,14 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 32396496 + 38610816 dialog-control-document staticline 0 1 0 - 32217768 + 39339760 0 wbStaticLineProxy wxID_STATIC @@ -3962,14 +3962,14 @@ All Rights Reserved. wxButton: wxID_OK - 32408880 + 15121680 dialog-control-document dialogcontrol 0 1 0 - 32217768 + 39339760 0 wbButtonProxy wxID_OK @@ -4017,14 +4017,14 @@ All Rights Reserved. Attach to Project - 32423288 + 15137232 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 9/3/2004 wbDialogProxy @@ -4085,14 +4085,14 @@ All Rights Reserved. wxBoxSizer V - 32439152 + 38676240 dialog-control-document sizer 0 1 0 - 32423288 + 15137232 0 wbBoxSizerProxy Vertical @@ -4111,14 +4111,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 32446464 + 38683168 dialog-control-document sizer 0 1 0 - 32439152 + 38676240 0 29/2/2005 wbFlexGridSizerProxy @@ -4143,14 +4143,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 32455648 + 38697248 dialog-control-document sizer 0 1 0 - 32446464 + 38683168 0 29/2/2005 wbBoxSizerProxy @@ -4170,14 +4170,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 32463976 + 38703744 dialog-control-document sizer 0 1 0 - 32455648 + 38697248 0 29/2/2005 wbFlexGridSizerProxy @@ -4202,14 +4202,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 32478792 + 38715632 dialog-control-document statictext 0 1 0 - 32463976 + 38703744 0 29/2/2005 wbStaticTextProxy @@ -4261,14 +4261,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTADDRESS - 32495888 + 38740608 dialog-control-document textctrl 0 1 0 - 32463976 + 38703744 0 29/2/2005 wbTextCtrlProxy @@ -4329,14 +4329,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 32516520 + 38743824 dialog-control-document statictext 0 1 0 - 32463976 + 38703744 0 29/2/2005 wbStaticTextProxy @@ -4388,14 +4388,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTACCOUNTKEY - 32533320 + 38912608 dialog-control-document textctrl 0 1 0 - 32463976 + 38703744 0 29/2/2005 wbTextCtrlProxy @@ -4457,14 +4457,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 32553840 + 38976256 dialog-control-document statictext 0 1 0 - 32455648 + 38697248 0 29/2/2005 wbStaticTextProxy @@ -4519,14 +4519,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxBoxSizer V - 32585232 + 38971808 dialog-control-document sizer 0 1 0 - 32446464 + 38683168 0 29/2/2005 wbBoxSizerProxy @@ -4546,14 +4546,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxButton: wxID_OK - 32603920 + 38913520 dialog-control-document dialogcontrol 0 1 0 - 32585232 + 38971808 0 29/2/2005 wbButtonProxy @@ -4600,14 +4600,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxButton: wxID_CANCEL - 32642240 + 39046096 dialog-control-document dialogcontrol 0 1 0 - 32585232 + 38971808 0 29/2/2005 wbButtonProxy @@ -4658,14 +4658,14 @@ Visit http://boinc.berkeley.edu for a list of projects. Account Manager Signup - 31993360 + 38684096 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 10/2/2005 wbDialogProxy @@ -4727,14 +4727,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxFlexGridSizer - 32718928 + 39101632 dialog-control-document sizer 0 1 0 - 31993360 + 38684096 0 28/5/2005 wbFlexGridSizerProxy @@ -4759,14 +4759,14 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE wxBoxSizer V - 32731040 + 39115680 dialog-control-document sizer 0 1 0 - 32718928 + 39101632 0 28/5/2005 wbBoxSizerProxy @@ -4786,14 +4786,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxStaticText: ID_ACCTMANAGERTEXT - 32740392 + 39128512 dialog-control-document statictext 0 1 0 - 32731040 + 39115680 0 28/5/2005 wbStaticTextProxy @@ -4845,14 +4845,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERDOCLINK - 32756808 + 39147328 dialog-control-document foreign 0 1 0 - 32731040 + 39115680 0 30/5/2005 wbCustomCtrlProxy:wxHyperLink @@ -4905,14 +4905,14 @@ For more information, click on the link below. wxFlexGridSizer - 32774248 + 39234672 dialog-control-document sizer 0 1 0 - 32731040 + 39115680 0 28/5/2005 wbFlexGridSizerProxy @@ -4937,14 +4937,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 32783424 + 39246496 dialog-control-document statictext 0 1 0 - 32774248 + 39234672 0 28/5/2005 wbStaticTextProxy @@ -4994,14 +4994,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERURL - 32820800 + 39366192 dialog-control-document textctrl 0 1 0 - 32774248 + 39234672 0 28/5/2005 wbTextCtrlProxy @@ -5062,14 +5062,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 32849424 + 39358864 dialog-control-document statictext 0 1 0 - 32774248 + 39234672 0 28/5/2005 wbStaticTextProxy @@ -5119,14 +5119,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERUSERNAME - 32865792 + 39400096 dialog-control-document textctrl 0 1 0 - 32774248 + 39234672 0 28/5/2005 wbTextCtrlProxy @@ -5187,14 +5187,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 32886224 + 39456816 dialog-control-document statictext 0 1 0 - 32774248 + 39234672 0 28/5/2005 wbStaticTextProxy @@ -5244,14 +5244,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERPASSWORD - 32902600 + 39479072 dialog-control-document textctrl 0 1 0 - 32774248 + 39234672 0 28/5/2005 wbTextCtrlProxy @@ -5314,14 +5314,14 @@ For more information, click on the link below. wxFlexGridSizer - 32922832 + 52247232 dialog-control-document sizer 0 1 0 - 32718928 + 39101632 0 28/5/2005 wbFlexGridSizerProxy @@ -5346,14 +5346,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 32930056 + 52259760 dialog-control-document dialogcontrol 0 1 0 - 32922832 + 52247232 0 28/5/2005 wbButtonProxy @@ -5398,14 +5398,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 32943184 + 52254416 dialog-control-document dialogcontrol 0 1 0 - 32922832 + 52247232 0 28/5/2005 wbButtonProxy @@ -5453,14 +5453,14 @@ For more information, click on the link below. Account Manager Status - 32445376 + 52283264 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 16/5/2005 wbDialogProxy @@ -5521,14 +5521,14 @@ For more information, click on the link below. wxBoxSizer V - 33257944 + 39103584 dialog-control-document sizer 0 1 0 - 32445376 + 52283264 0 16/5/2005 wbBoxSizerProxy @@ -5548,14 +5548,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer H - 33264632 + 52302816 dialog-control-document sizer 0 1 0 - 33257944 + 39103584 0 16/5/2005 wbBoxSizerProxy @@ -5575,14 +5575,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer V - 33272640 + 52317968 dialog-control-document sizer 0 1 0 - 33264632 + 52302816 0 8/6/2005 wbBoxSizerProxy @@ -5602,14 +5602,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 33282080 + 52323120 dialog-control-document statictext 0 1 0 - 33272640 + 52317968 0 8/6/2005 wbStaticTextProxy @@ -5659,14 +5659,14 @@ For more information, click on the link below. wxFlexGridSizer - 33298320 + 52344304 dialog-control-document sizer 0 1 0 - 33272640 + 52317968 0 8/6/2005 wbFlexGridSizerProxy @@ -5691,14 +5691,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 33307736 + 52356160 dialog-control-document statictext 0 1 0 - 33298320 + 52344304 0 8/6/2005 wbStaticTextProxy @@ -5748,14 +5748,14 @@ For more information, click on the link below. wxStaticText: ID_ACCTMANAGERNAME - 33324240 + 52378240 dialog-control-document statictext 0 1 0 - 33298320 + 52344304 0 8/6/2005 wbStaticTextProxy @@ -5805,14 +5805,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 33340680 + 52371888 dialog-control-document statictext 0 1 0 - 33298320 + 52344304 0 8/6/2005 wbStaticTextProxy @@ -5862,14 +5862,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERLINK - 33357312 + 52415424 dialog-control-document foreign 0 1 0 - 33298320 + 52344304 0 8/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -5924,14 +5924,14 @@ For more information, click on the link below. wxBoxSizer V - 33374976 + 52416272 dialog-control-document sizer 0 1 0 - 33264632 + 52302816 0 16/5/2005 wbBoxSizerProxy @@ -5951,14 +5951,14 @@ For more information, click on the link below. <Any platform> wxButton: ID_UPDATE - 33380992 + 52428992 dialog-control-document dialogcontrol 0 1 0 - 33374976 + 52416272 0 16/5/2005 wbButtonProxy @@ -6004,14 +6004,14 @@ For more information, click on the link below. wxButton: ID_CHANGE - 33394288 + 52430016 dialog-control-document dialogcontrol 0 1 0 - 33374976 + 52416272 0 16/5/2005 wbButtonProxy @@ -6057,14 +6057,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 33408016 + 52465904 dialog-control-document dialogcontrol 0 1 0 - 33374976 + 52416272 0 16/5/2005 wbButtonProxy @@ -6113,14 +6113,14 @@ For more information, click on the link below. Select Computer - 32462528 + 52489936 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 29/2/2005 wbDialogProxy @@ -6181,14 +6181,14 @@ For more information, click on the link below. wxBoxSizer V - 33437072 + 38914048 dialog-control-document sizer 0 1 0 - 32462528 + 52489936 0 29/2/2005 wbBoxSizerProxy @@ -6208,14 +6208,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 33443456 + 52499136 dialog-control-document sizer 0 1 0 - 33437072 + 38914048 0 29/2/2005 wbFlexGridSizerProxy @@ -6240,14 +6240,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 33451960 + 52513216 dialog-control-document sizer 0 1 0 - 33443456 + 52499136 0 29/2/2005 wbBoxSizerProxy @@ -6267,14 +6267,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 33460256 + 52520112 dialog-control-document sizer 0 1 0 - 33451960 + 52513216 0 29/2/2005 wbFlexGridSizerProxy @@ -6299,14 +6299,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 33470928 + 52532080 dialog-control-document statictext 0 1 0 - 33460256 + 52520112 0 29/2/2005 wbStaticTextProxy @@ -6356,14 +6356,14 @@ For more information, click on the link below. wxComboBox: ID_SELECTCOMPUTERNAME - 33487232 + 52527504 dialog-control-document combobox 0 1 0 - 33460256 + 52520112 0 29/2/2005 wbComboBoxProxy @@ -6408,14 +6408,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 33501704 + 52575424 dialog-control-document statictext 0 1 0 - 33460256 + 52520112 0 29/2/2005 wbStaticTextProxy @@ -6465,14 +6465,14 @@ For more information, click on the link below. wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 33518704 + 52589456 dialog-control-document textctrl 0 1 0 - 33460256 + 52520112 0 29/2/2005 wbTextCtrlProxy @@ -6535,14 +6535,14 @@ For more information, click on the link below. wxBoxSizer V - 56214648 + 52609632 dialog-control-document sizer 0 1 0 - 33443456 + 52499136 0 29/2/2005 wbBoxSizerProxy @@ -6562,14 +6562,14 @@ For more information, click on the link below. <Any platform> wxButton: wxID_OK - 56220720 + 52623312 dialog-control-document dialogcontrol 0 1 0 - 56214648 + 52609632 0 29/2/2005 wbButtonProxy @@ -6616,14 +6616,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 56234304 + 52635760 dialog-control-document dialogcontrol 0 1 0 - 56214648 + 52609632 0 29/2/2005 wbButtonProxy @@ -6674,14 +6674,14 @@ For more information, click on the link below. Dialup Logon - 32902072 + 52651328 dialog-document dialog 0 1 0 - 15092104 + 15094720 0 28/5/2005 wbDialogProxy @@ -6742,14 +6742,14 @@ For more information, click on the link below. wxFlexGridSizer - 56262264 + 52664928 dialog-control-document sizer 0 1 0 - 32902072 + 52651328 0 28/5/2005 wbFlexGridSizerProxy @@ -6774,14 +6774,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 56269696 + 52670800 dialog-control-document sizer 0 1 0 - 56262264 + 52664928 0 28/5/2005 wbBoxSizerProxy @@ -6801,14 +6801,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 56277704 + 52685872 dialog-control-document sizer 0 1 0 - 56269696 + 52670800 0 28/5/2005 wbFlexGridSizerProxy @@ -6833,14 +6833,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 56288352 + 52696640 dialog-control-document statictext 0 1 0 - 56277704 + 52685872 0 28/5/2005 wbStaticTextProxy @@ -6890,14 +6890,14 @@ For more information, click on the link below. wxTextCtrl: ID_USERNAME - 56305120 + 52718928 dialog-control-document textctrl 0 1 0 - 56277704 + 52685872 0 28/5/2005 wbTextCtrlProxy @@ -6958,14 +6958,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56325600 + 52748048 dialog-control-document statictext 0 1 0 - 56277704 + 52685872 0 28/5/2005 wbStaticTextProxy @@ -7015,14 +7015,14 @@ For more information, click on the link below. wxTextCtrl: ID_PASSWORD - 56341984 + 52742176 dialog-control-document textctrl 0 1 0 - 56277704 + 52685872 0 28/5/2005 wbTextCtrlProxy @@ -7085,14 +7085,14 @@ For more information, click on the link below. wxFlexGridSizer - 56362216 + 52777344 dialog-control-document sizer 0 1 0 - 56262264 + 52664928 0 28/5/2005 wbFlexGridSizerProxy @@ -7117,14 +7117,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 56369496 + 52679264 dialog-control-document dialogcontrol 0 1 0 - 56362216 + 52777344 0 28/5/2005 wbButtonProxy @@ -7169,14 +7169,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 56382600 + 52804112 dialog-control-document dialogcontrol 0 1 0 - 56362216 + 52777344 0 28/5/2005 wbButtonProxy @@ -7224,14 +7224,14 @@ For more information, click on the link below. Attach to Project Wizard - 33450728 + 52797680 dialog-document wizarddialog 0 1 0 - 15092104 + 15094720 0 21/6/2005 wbWizardProxy @@ -7271,14 +7271,14 @@ For more information, click on the link below. FALSE wxWizardPage: ID_WELCOMEPAGE - 56405776 + 52825872 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 21/6/2005 wbWizardPageProxy @@ -7316,14 +7316,14 @@ For more information, click on the link below. wxBoxSizer V - 56416048 + 52835904 dialog-control-document sizer 0 1 0 - 56405776 + 52825872 0 21/6/2005 wbBoxSizerProxy @@ -7343,14 +7343,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 56424648 + 52849056 dialog-control-document statictext 0 1 0 - 56416048 + 52835904 0 21/6/2005 wbStaticTextProxy @@ -7400,14 +7400,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56440936 + 52867472 dialog-control-document statictext 0 1 0 - 56416048 + 52835904 0 21/6/2005 wbStaticTextProxy @@ -7457,14 +7457,14 @@ For more information, click on the link below. Spacer - 56457168 + 52863408 dialog-control-document spacer 0 1 0 - 56416048 + 52835904 0 21/6/2005 wbSpacerProxy @@ -7485,14 +7485,14 @@ For more information, click on the link below. wxStaticBoxSizer V - 56463224 + 52895472 dialog-control-document sizer 0 1 0 - 56416048 + 52835904 0 27/6/2005 wbStaticBoxSizerProxy @@ -7516,14 +7516,14 @@ For more information, click on the link below. __WXDEBUG__ wxFlexGridSizer - 56471776 + 52901104 dialog-control-document sizer 0 1 0 - 56463224 + 52895472 0 27/6/2005 wbFlexGridSizerProxy @@ -7548,14 +7548,14 @@ For more information, click on the link below. FALSE wxCheckBox: ID_ERRPROJECTPROPERTIES - 56482064 + 52913600 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 27/6/2005 wbCheckBoxProxy @@ -7600,14 +7600,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRPROJECTCOMM - 56496224 + 52936144 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 27/6/2005 wbCheckBoxProxy @@ -7652,14 +7652,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRPROJECTPROPERTIESURL - 56510576 + 52952768 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 29/6/2005 wbCheckBoxProxy @@ -7704,14 +7704,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRACCOUNTCREATIONDISABLED - 56524928 + 52961392 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 29/6/2005 wbCheckBoxProxy @@ -7756,14 +7756,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRCLIENTACCOUNTCREATIONDISABLED - 56539248 + 52962256 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 9/7/2005 wbCheckBoxProxy @@ -7808,14 +7808,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRACCOUNTALREADYEXISTS - 56553560 + 52994496 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 29/6/2005 wbCheckBoxProxy @@ -7860,14 +7860,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRGOOGLECOMM - 56567872 + 52995680 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 27/6/2005 wbCheckBoxProxy @@ -7912,14 +7912,14 @@ For more information, click on the link below. Spacer - 56582200 + 53029216 dialog-control-document spacer 0 1 0 - 56471776 + 52901104 0 9/7/2005 wbSpacerProxy @@ -7940,14 +7940,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRYAHOOCOMM - 56588664 + 53036896 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 27/6/2005 wbCheckBoxProxy @@ -7992,14 +7992,14 @@ For more information, click on the link below. Spacer - 56603048 + 53022800 dialog-control-document spacer 0 1 0 - 56471776 + 52901104 0 9/7/2005 wbSpacerProxy @@ -8020,14 +8020,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRNETDETECTION - 56609512 + 53056320 dialog-control-document checkbox 0 1 0 - 56471776 + 52901104 0 27/6/2005 wbCheckBoxProxy @@ -8074,14 +8074,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56623816 + 53072480 dialog-control-document statictext 0 1 0 - 56416048 + 52835904 0 21/6/2005 wbStaticTextProxy @@ -8133,14 +8133,14 @@ For more information, click on the link below. wxWizardPage: ID_PROJECTINFOPAGE - 56341552 + 53096208 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 21/6/2005 wbWizardPageProxy @@ -8179,14 +8179,14 @@ For more information, click on the link below. wxBoxSizer V - 56648040 + 53106432 dialog-control-document sizer 0 1 0 - 56341552 + 53096208 0 21/6/2005 wbBoxSizerProxy @@ -8206,14 +8206,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 56654952 + 52777664 dialog-control-document statictext 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbStaticTextProxy @@ -8263,14 +8263,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56671208 + 53131904 dialog-control-document statictext 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbStaticTextProxy @@ -8320,14 +8320,14 @@ For more information, click on the link below. Spacer - 56687432 + 53127440 dialog-control-document spacer 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbSpacerProxy @@ -8348,14 +8348,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56693784 + 53151808 dialog-control-document statictext 0 1 0 - 56648040 + 53106432 0 10/7/2005 wbStaticTextProxy @@ -8405,14 +8405,14 @@ For more information, click on the link below. Spacer - 56709992 + 53174032 dialog-control-document spacer 0 1 0 - 56648040 + 53106432 0 10/7/2005 wbSpacerProxy @@ -8433,14 +8433,14 @@ For more information, click on the link below. wxFlexGridSizer - 56716048 + 53175040 dialog-control-document sizer 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbFlexGridSizerProxy @@ -8465,14 +8465,14 @@ For more information, click on the link below. FALSE wxStaticText: ID_PROJECTURLSTATICCTRL - 56725872 + 53188160 dialog-control-document statictext 0 1 0 - 56716048 + 53175040 0 21/6/2005 wbStaticTextProxy @@ -8522,14 +8522,14 @@ For more information, click on the link below. wxTextCtrl: ID_PROJECTURLCTRL - 56742552 + 53210448 dialog-control-document textctrl 0 1 0 - 56716048 + 53175040 0 21/6/2005 wbTextCtrlProxy @@ -8591,14 +8591,14 @@ For more information, click on the link below. Spacer - 56762808 + 53233824 dialog-control-document spacer 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbSpacerProxy @@ -8619,14 +8619,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56768864 + 53240896 dialog-control-document statictext 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbStaticTextProxy @@ -8676,14 +8676,14 @@ For more information, click on the link below. wxHyperLink: ID_PROJECRINFOBOINCLINK - 56784096 + 53258720 dialog-control-document foreign 0 1 0 - 56648040 + 53106432 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -8738,14 +8738,14 @@ For more information, click on the link below. wxWizardPage: ID_PROJECTPROPERTIESPAGE - 56800952 + 53253152 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 27/6/2005 wbWizardPageProxy @@ -8782,14 +8782,14 @@ For more information, click on the link below. wxBoxSizer V - 56811152 + 53283808 dialog-control-document sizer 0 1 0 - 56800952 + 53253152 0 27/6/2005 wbBoxSizerProxy @@ -8809,14 +8809,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 56818448 + 53289024 dialog-control-document statictext 0 1 0 - 56811152 + 53283808 0 27/6/2005 wbStaticTextProxy @@ -8866,14 +8866,14 @@ For more information, click on the link below. Spacer - 56834688 + 53292416 dialog-control-document spacer 0 1 0 - 56811152 + 53283808 0 27/6/2005 wbSpacerProxy @@ -8894,14 +8894,14 @@ For more information, click on the link below. wxFlexGridSizer - 56840744 + 53320192 dialog-control-document sizer 0 1 0 - 56811152 + 53283808 0 27/6/2005 wbFlexGridSizerProxy @@ -8926,14 +8926,14 @@ For more information, click on the link below. FALSE wxGauge: ID_PROJECTPROPERTIESGAUGECTRL - 56850616 + 53332032 dialog-control-document gauge 0 1 0 - 56840744 + 53320192 0 11/7/2005 wbGaugeProxy @@ -8987,14 +8987,14 @@ For more information, click on the link below. wxWizardPage: ID_ACCOUNTKEYPAGE - 56866536 + 53352496 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 29/6/2005 wbWizardPageProxy @@ -9032,14 +9032,14 @@ For more information, click on the link below. wxBoxSizer V - 56876856 + 53370640 dialog-control-document sizer 0 1 0 - 56866536 + 53352496 0 29/6/2005 wbBoxSizerProxy @@ -9059,14 +9059,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 56883200 + 53375760 dialog-control-document statictext 0 1 0 - 56876856 + 53370640 0 29/6/2005 wbStaticTextProxy @@ -9116,14 +9116,14 @@ For more information, click on the link below. Spacer - 56915320 + 53384352 dialog-control-document spacer 0 1 0 - 56876856 + 53370640 0 29/6/2005 wbSpacerProxy @@ -9144,14 +9144,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56921712 + 53391376 dialog-control-document statictext 0 1 0 - 56876856 + 53370640 0 29/6/2005 wbStaticTextProxy @@ -9201,14 +9201,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56937920 + 53393536 dialog-control-document statictext 0 1 0 - 56876856 + 53370640 0 30/6/2005 wbStaticTextProxy @@ -9259,14 +9259,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 56954144 + 53428880 dialog-control-document statictext 0 1 0 - 56876856 + 53370640 0 30/6/2005 wbStaticTextProxy @@ -9316,14 +9316,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 56970368 + 53456224 dialog-control-document statictext 0 1 0 - 56876856 + 53370640 0 30/6/2005 wbStaticTextProxy @@ -9373,14 +9373,14 @@ Your account key will be emailed to you. Spacer - 56986632 + 53451872 dialog-control-document spacer 0 1 0 - 56876856 + 53370640 0 10/7/2005 wbSpacerProxy @@ -9401,14 +9401,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 56992728 + 53473872 dialog-control-document sizer 0 1 0 - 56876856 + 53370640 0 30/6/2005 wbFlexGridSizerProxy @@ -9433,14 +9433,14 @@ Your account key will be emailed to you. FALSE wxStaticText: ID_ACCOUNTKEYSTATICCTRL - 57002568 + 53482880 dialog-control-document statictext 0 1 0 - 56992728 + 53473872 0 30/6/2005 wbStaticTextProxy @@ -9490,14 +9490,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTKEYCTRL - 57019240 + 53505104 dialog-control-document textctrl 0 1 0 - 56992728 + 53473872 0 30/6/2005 wbTextCtrlProxy @@ -9561,14 +9561,14 @@ Your account key will be emailed to you. wxWizardPage: ID_ACCOUNTINFOPAGE - 57039464 + 53527392 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 21/6/2005 wbWizardPageProxy @@ -9609,14 +9609,14 @@ Your account key will be emailed to you. wxBoxSizer V - 57049608 + 53364256 dialog-control-document sizer 0 1 0 - 57039464 + 53527392 0 21/6/2005 wbBoxSizerProxy @@ -9636,14 +9636,14 @@ Your account key will be emailed to you. <Any platform> wxStaticText: wxID_STATIC - 57055968 + 53478464 dialog-control-document statictext 0 1 0 - 57049608 + 53364256 0 21/6/2005 wbStaticTextProxy @@ -9693,14 +9693,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 57071672 + 53566528 dialog-control-document statictext 0 1 0 - 57049608 + 53364256 0 21/6/2005 wbStaticTextProxy @@ -9750,14 +9750,14 @@ Your account key will be emailed to you. Spacer - 57087896 + 53581360 dialog-control-document spacer 0 1 0 - 57049608 + 53364256 0 21/6/2005 wbSpacerProxy @@ -9778,14 +9778,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 57110448 + 53590352 dialog-control-document sizer 0 1 0 - 57049608 + 53364256 0 21/6/2005 wbFlexGridSizerProxy @@ -9810,14 +9810,14 @@ Your account key will be emailed to you. FALSE wxRadioButton: ID_ACCOUNTCREATECTRL - 57119496 + 53602928 dialog-control-document radiobutton 0 1 0 - 57110448 + 53590352 0 21/6/2005 wbRadioButtonProxy @@ -9861,14 +9861,14 @@ Your account key will be emailed to you. wxRadioButton: ID_ACCOUNTUSEEXISTINGCTRL - 57133464 + 53612752 dialog-control-document radiobutton 0 1 0 - 57110448 + 53590352 0 21/6/2005 wbRadioButtonProxy @@ -9913,14 +9913,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 57147408 + 53614224 dialog-control-document sizer 0 1 0 - 57049608 + 53364256 0 21/6/2005 wbFlexGridSizerProxy @@ -9945,14 +9945,14 @@ Your account key will be emailed to you. FALSE wxStaticText: ID_ACCOUNTEMAILADDRESSSTATICCTRL - 57155664 + 53583360 dialog-control-document statictext 0 1 0 - 57147408 + 53614224 0 21/6/2005 wbStaticTextProxy @@ -10002,14 +10002,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTEMAILADDRESSCTRL - 57172360 + 53660000 dialog-control-document textctrl 0 1 0 - 57147408 + 53614224 0 21/6/2005 wbTextCtrlProxy @@ -10070,14 +10070,14 @@ Your account key will be emailed to you. wxStaticText: ID_ACCOUNTPASSWORDSTATICCTRL - 57192784 + 53682512 dialog-control-document statictext 0 1 0 - 57147408 + 53614224 0 21/6/2005 wbStaticTextProxy @@ -10127,14 +10127,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTPASSWORDCTRL - 57209176 + 53704736 dialog-control-document textctrl 0 1 0 - 57147408 + 53614224 0 21/6/2005 wbTextCtrlProxy @@ -10195,14 +10195,14 @@ Your account key will be emailed to you. wxStaticText: ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL - 57229680 + 53724192 dialog-control-document statictext 0 1 0 - 57147408 + 53614224 0 21/6/2005 wbStaticTextProxy @@ -10252,14 +10252,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTCONFIRMPASSWORDCTRL - 57246144 + 53719648 dialog-control-document textctrl 0 1 0 - 57147408 + 53614224 0 21/6/2005 wbTextCtrlProxy @@ -10323,14 +10323,14 @@ Your account key will be emailed to you. wxWizardPage: ID_ACCOUNTCREATIONPAGE - 56850040 + 53767760 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 27/6/2005 wbWizardPageProxy @@ -10367,14 +10367,14 @@ Your account key will be emailed to you. wxBoxSizer V - 57276080 + 53614720 dialog-control-document sizer 0 1 0 - 56850040 + 53767760 0 27/6/2005 wbBoxSizerProxy @@ -10394,14 +10394,14 @@ Your account key will be emailed to you. <Any platform> wxStaticText: wxID_STATIC - 57282376 + 53777728 dialog-control-document statictext 0 1 0 - 57276080 + 53614720 0 27/6/2005 wbStaticTextProxy @@ -10451,14 +10451,14 @@ Your account key will be emailed to you. Spacer - 57298128 + 53779792 dialog-control-document spacer 0 1 0 - 57276080 + 53614720 0 27/6/2005 wbSpacerProxy @@ -10479,14 +10479,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 57304144 + 53803552 dialog-control-document sizer 0 1 0 - 57276080 + 53614720 0 27/6/2005 wbFlexGridSizerProxy @@ -10511,14 +10511,14 @@ Your account key will be emailed to you. FALSE wxStaticBitmap: ID_PROJECTCOMMUNICATIONSIMAGECTRL - 57313688 + 53815504 dialog-control-document staticbitmap 0 1 0 - 57304144 + 53803552 0 27/6/2005 wbStaticBitmapProxy @@ -10562,14 +10562,14 @@ Your account key will be emailed to you. wxStaticText: ID_PROJECTCOMMUNICATIONSCTRL - 57327768 + 53831904 dialog-control-document statictext 0 1 0 - 57304144 + 53803552 0 27/6/2005 wbStaticTextProxy @@ -10620,14 +10620,14 @@ Your account key will be emailed to you. wxStaticText: ID_FINALACCOUNTCREATIONSTATUSCTRL - 57343936 + 53850512 dialog-control-document statictext 0 1 0 - 57276080 + 53614720 0 27/6/2005 wbStaticTextProxy @@ -10679,14 +10679,14 @@ Your account key will be emailed to you. wxWizardPage: ID_COMPLETIONPAGE - 57359048 + 53817104 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 24/6/2005 wbWizardPageProxy @@ -10724,14 +10724,14 @@ Your account key will be emailed to you. wxBoxSizer V - 57369296 + 53873632 dialog-control-document sizer 0 1 0 - 57359048 + 53817104 0 27/6/2005 wbBoxSizerProxy @@ -10751,14 +10751,14 @@ Your account key will be emailed to you. <Any platform> wxStaticText: wxID_STATIC - 57376416 + 53878848 dialog-control-document statictext 0 1 0 - 57369296 + 53873632 0 27/6/2005 wbStaticTextProxy @@ -10808,14 +10808,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 57392672 + 53880320 dialog-control-document statictext 0 1 0 - 57369296 + 53873632 0 27/6/2005 wbStaticTextProxy @@ -10865,14 +10865,14 @@ Your account key will be emailed to you. Spacer - 57408912 + 53922304 dialog-control-document spacer 0 1 0 - 57369296 + 53873632 0 27/6/2005 wbSpacerProxy @@ -10893,14 +10893,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 57415264 + 53929312 dialog-control-document statictext 0 1 0 - 57369296 + 53873632 0 10/7/2005 wbStaticTextProxy @@ -10953,14 +10953,14 @@ where you can set your account name and preferences. wxWizardPage: ID_COMPLETIONERRORPAGE - 57431384 + 53952272 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 10/7/2005 wbWizardPageProxy @@ -10997,14 +10997,14 @@ where you can set your account name and preferences. wxBoxSizer V - 57441592 + 53962544 dialog-control-document sizer 0 1 0 - 57431384 + 53952272 0 10/7/2005 wbBoxSizerProxy @@ -11024,14 +11024,14 @@ where you can set your account name and preferences. <Any platform> wxStaticText: wxID_STATIC - 57449072 + 53916000 dialog-control-document statictext 0 1 0 - 57441592 + 53962544 0 10/7/2005 wbStaticTextProxy @@ -11081,14 +11081,14 @@ where you can set your account name and preferences. Spacer - 57465328 + 53988976 dialog-control-document spacer 0 1 0 - 57441592 + 53962544 0 10/7/2005 wbSpacerProxy @@ -11108,43 +11108,15 @@ where you can set your account name and preferences. <Any platform> - Spacer - 57487888 - dialog-control-document - - spacer - 0 - 1 - 0 - 57441592 - 0 - 10/7/2005 - wbSpacerProxy - 5 - 5 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - <Any platform> - - wxStaticText: wxID_STATIC - 57494280 + 53810256 dialog-control-document statictext 0 1 0 - 57441592 + 53962544 0 10/7/2005 wbStaticTextProxy @@ -11194,16 +11166,16 @@ where you can set your account name and preferences. - + wxWizardPage: ID_ERRPROJECTNOTDETECTEDPAGE - 57510400 + 54020752 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 9/7/2005 wbWizardPageProxy @@ -11238,16 +11210,16 @@ where you can set your account name and preferences. -1 - + wxBoxSizer V - 57520616 + 54030896 dialog-control-document sizer 0 1 0 - 57510400 + 54020752 0 9/7/2005 wbBoxSizerProxy @@ -11265,16 +11237,16 @@ where you can set your account name and preferences. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57528144 + 54037952 dialog-control-document statictext 0 1 0 - 57520616 + 54030896 0 9/7/2005 wbStaticTextProxy @@ -11322,16 +11294,16 @@ where you can set your account name and preferences. - + Spacer - 57544400 + 54050832 dialog-control-document spacer 0 1 0 - 57520616 + 54030896 0 9/7/2005 wbSpacerProxy @@ -11350,16 +11322,16 @@ where you can set your account name and preferences. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57550752 + 54066048 dialog-control-document statictext 0 1 0 - 57520616 + 54030896 0 9/7/2005 wbStaticTextProxy @@ -11407,16 +11379,16 @@ where you can set your account name and preferences. - + wxStaticText: wxID_STATIC - 57566960 + 54087440 dialog-control-document statictext 0 1 0 - 57520616 + 54030896 0 9/7/2005 wbStaticTextProxy @@ -11466,16 +11438,16 @@ where you can set your account name and preferences. - + wxWizardPage: ID_ERRPROJECTUNAVAILABLEPAGE - 57583104 + 54021904 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 24/6/2005 wbWizardPageProxy @@ -11510,16 +11482,16 @@ where you can set your account name and preferences. -1 - + wxBoxSizer V - 57593400 + 54105584 dialog-control-document sizer 0 1 0 - 57583104 + 54021904 0 27/6/2005 wbBoxSizerProxy @@ -11537,16 +11509,16 @@ where you can set your account name and preferences. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57600880 + 54118720 dialog-control-document statictext 0 1 0 - 57593400 + 54105584 0 27/6/2005 wbStaticTextProxy @@ -11594,16 +11566,16 @@ where you can set your account name and preferences. - + Spacer - 57617136 + 54138128 dialog-control-document spacer 0 1 0 - 57593400 + 54105584 0 27/6/2005 wbSpacerProxy @@ -11622,16 +11594,16 @@ where you can set your account name and preferences. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57623488 + 54145168 dialog-control-document statictext 0 1 0 - 57593400 + 54105584 0 1/7/2005 wbStaticTextProxy @@ -11682,16 +11654,16 @@ Please try again later. - + wxWizardPage: ID_ERRNOINTERNETCONNECTIONPAGE - 57639608 + 54113408 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 24/6/2005 wbWizardPageProxy @@ -11726,16 +11698,16 @@ Please try again later. -1 - + wxBoxSizer V - 57649904 + 54172224 dialog-control-document sizer 0 1 0 - 57639608 + 54113408 0 27/6/2005 wbBoxSizerProxy @@ -11753,16 +11725,16 @@ Please try again later. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57657384 + 54185408 dialog-control-document statictext 0 1 0 - 57649904 + 54172224 0 27/6/2005 wbStaticTextProxy @@ -11810,16 +11782,16 @@ Please try again later. - + Spacer - 57673640 + 54204000 dialog-control-document spacer 0 1 0 - 57649904 + 54172224 0 11/7/2005 wbSpacerProxy @@ -11838,16 +11810,16 @@ Please try again later. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57680032 + 54211056 dialog-control-document statictext 0 1 0 - 57649904 + 54172224 0 27/6/2005 wbStaticTextProxy @@ -11897,16 +11869,16 @@ Please try again later. - + wxWizardPage: ID_ERRACCOUNTALREADYEXISTSPAGE - 57696152 + 54180752 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 24/6/2005 wbWizardPageProxy @@ -11941,16 +11913,16 @@ Please try again later. -1 - + wxBoxSizer V - 57706400 + 54238992 dialog-control-document sizer 0 1 0 - 57696152 + 54180752 0 27/6/2005 wbBoxSizerProxy @@ -11968,16 +11940,16 @@ Please try again later. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57713928 + 54244048 dialog-control-document statictext 0 1 0 - 57706400 + 54238992 0 27/6/2005 wbStaticTextProxy @@ -12025,16 +11997,16 @@ Please try again later. - + Spacer - 57730184 + 54270752 dialog-control-document spacer 0 1 0 - 57706400 + 54238992 0 11/7/2005 wbSpacerProxy @@ -12053,16 +12025,16 @@ Please try again later. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57736536 + 54277792 dialog-control-document statictext 0 1 0 - 57706400 + 54238992 0 27/6/2005 wbStaticTextProxy @@ -12115,16 +12087,16 @@ the instructions there. - + wxWizardPage: ID_ERRACCOUNTCREATIONDISABLEDPAGE - 57752656 + 54278448 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 29/6/2005 wbWizardPageProxy @@ -12159,16 +12131,16 @@ the instructions there. -1 - + wxBoxSizer V - 57762928 + 54298416 dialog-control-document sizer 0 1 0 - 57752656 + 54278448 0 29/6/2005 wbBoxSizerProxy @@ -12186,16 +12158,16 @@ the instructions there. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57770424 + 54311584 dialog-control-document statictext 0 1 0 - 57762928 + 54298416 0 29/6/2005 wbStaticTextProxy @@ -12243,16 +12215,16 @@ the instructions there. - + Spacer - 57786664 + 54307136 dialog-control-document spacer 0 1 0 - 57762928 + 54298416 0 11/7/2005 wbSpacerProxy @@ -12271,16 +12243,16 @@ the instructions there. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57793048 + 54333744 dialog-control-document statictext 0 1 0 - 57762928 + 54298416 0 29/6/2005 wbStaticTextProxy @@ -12330,16 +12302,16 @@ the instructions there. - + wxWizardPage: ID_ERRPROXYINFOPAGE - 57809168 + 54336432 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 27/6/2005 wbWizardPageProxy @@ -12374,16 +12346,16 @@ the instructions there. -1 - + wxBoxSizer V - 57819464 + 54365712 dialog-control-document sizer 0 1 0 - 57809168 + 54336432 0 27/6/2005 wbBoxSizerProxy @@ -12401,16 +12373,16 @@ the instructions there. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57826944 + 54370544 dialog-control-document statictext 0 1 0 - 57819464 + 54365712 0 27/6/2005 wbStaticTextProxy @@ -12458,16 +12430,16 @@ the instructions there. - + wxStaticText: wxID_STATIC - 57843200 + 54393312 dialog-control-document statictext 0 1 0 - 57819464 + 54365712 0 27/6/2005 wbStaticTextProxy @@ -12520,16 +12492,16 @@ Click Next to do proxy configuration. - + Spacer - 57859400 + 54414240 dialog-control-document spacer 0 1 0 - 57819464 + 54365712 0 27/6/2005 wbSpacerProxy @@ -12550,16 +12522,16 @@ Click Next to do proxy configuration. - + wxWizardPage: ID_ERRPROXYHTTPPAGE - 57865512 + 54422224 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 27/6/2005 wbWizardPageProxy @@ -12598,16 +12570,16 @@ Click Next to do proxy configuration. -1 - + wxBoxSizer V - 57875784 + 54373328 dialog-control-document sizer 0 1 0 - 57865512 + 54422224 0 27/6/2005 wbBoxSizerProxy @@ -12625,16 +12597,16 @@ Click Next to do proxy configuration. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 57883688 + 54437280 dialog-control-document statictext 0 1 0 - 57875784 + 54373328 0 27/6/2005 wbStaticTextProxy @@ -12682,16 +12654,16 @@ Click Next to do proxy configuration. - + wxStaticText: wxID_STATIC - 57899944 + 54431824 dialog-control-document statictext 0 1 0 - 57875784 + 54373328 0 27/6/2005 wbStaticTextProxy @@ -12740,72 +12712,44 @@ If you're not sure, click Autodetect. + + Spacer + 54474160 + dialog-control-document + + spacer + 0 + 1 + 0 + 54373328 + 0 + 27/6/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + - Spacer - 57916176 - dialog-control-document - - spacer - 0 - 1 - 0 - 57875784 - 0 - 27/6/2005 - wbSpacerProxy - 5 - 5 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - <Any platform> - - - Spacer - 57922240 - dialog-control-document - - spacer - 0 - 1 - 0 - 57875784 - 0 - 27/6/2005 - wbSpacerProxy - 5 - 5 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - <Any platform> - - wxButton: ID_HTTPAUTODETECT - 57928712 + 54489312 dialog-control-document dialogcontrol 0 1 0 - 57875784 + 54373328 0 27/6/2005 wbButtonProxy @@ -12849,16 +12793,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 57942872 + 54507552 dialog-control-document sizer 0 1 0 - 57875784 + 54373328 0 27/6/2005 wbFlexGridSizerProxy @@ -12881,16 +12825,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxStaticText: ID_PROXYHTTPSERVERSTATICCTRL - 57952480 + 54519392 dialog-control-document statictext 0 1 0 - 57942872 + 54507552 0 27/6/2005 wbStaticTextProxy @@ -12938,16 +12882,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 57968624 + 54534976 dialog-control-document sizer 0 1 0 - 57942872 + 54507552 0 27/6/2005 wbFlexGridSizerProxy @@ -12970,16 +12914,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYHTTPSERVERCTRL - 57978560 + 54554384 dialog-control-document textctrl 0 1 0 - 57968624 + 54534976 0 27/6/2005 wbTextCtrlProxy @@ -13038,16 +12982,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYHTTPPORTSTATICCTRL - 57999160 + 54572016 dialog-control-document statictext 0 1 0 - 57968624 + 54534976 0 27/6/2005 wbStaticTextProxy @@ -13095,16 +13039,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYHTTPPORTCTRL - 58015592 + 54573344 dialog-control-document textctrl 0 1 0 - 57968624 + 54534976 0 27/6/2005 wbTextCtrlProxy @@ -13164,16 +13108,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYHTTPUSERNAMESTATICCTRL - 58036072 + 54614208 dialog-control-document statictext 0 1 0 - 57942872 + 54507552 0 27/6/2005 wbStaticTextProxy @@ -13221,16 +13165,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYHTTPUSERNAMECTRL - 58051248 + 54635424 dialog-control-document textctrl 0 1 0 - 57942872 + 54507552 0 27/6/2005 wbTextCtrlProxy @@ -13289,16 +13233,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYHTTPPASSWORDSTATICCTRL - 58071200 + 54629616 dialog-control-document statictext 0 1 0 - 57942872 + 54507552 0 27/6/2005 wbStaticTextProxy @@ -13346,16 +13290,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYHTTPPASSWORDCTRL - 58087568 + 54677264 dialog-control-document textctrl 0 1 0 - 57942872 + 54507552 0 27/6/2005 wbTextCtrlProxy @@ -13417,16 +13361,16 @@ If you're not sure, click Autodetect. - + wxWizardPage: ID_ERRPROXYSOCKSPAGE - 58107784 + 54694160 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 27/6/2005 wbWizardPageProxy @@ -13465,16 +13409,16 @@ If you're not sure, click Autodetect. -1 - + wxBoxSizer V - 58117544 + 54712416 dialog-control-document sizer 0 1 0 - 58107784 + 54694160 0 27/6/2005 wbBoxSizerProxy @@ -13492,16 +13436,16 @@ If you're not sure, click Autodetect. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 58123888 + 54374064 dialog-control-document statictext 0 1 0 - 58117544 + 54712416 0 27/6/2005 wbStaticTextProxy @@ -13549,16 +13493,16 @@ If you're not sure, click Autodetect. - + wxStaticText: wxID_STATIC - 58139808 + 54734240 dialog-control-document statictext 0 1 0 - 58117544 + 54712416 0 27/6/2005 wbStaticTextProxy @@ -13608,16 +13552,16 @@ If you're not sure, click Autodetect. - + Spacer - 58156040 + 54752080 dialog-control-document spacer 0 1 0 - 58117544 + 54712416 0 27/6/2005 wbSpacerProxy @@ -13636,44 +13580,16 @@ If you're not sure, click Autodetect. FALSE <Any platform> - - Spacer - 58162096 - dialog-control-document - - spacer - 0 - 1 - 0 - 58117544 - 0 - 27/6/2005 - wbSpacerProxy - 5 - 5 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - <Any platform> - - + wxButton: ID_SOCKSAUTODETECT - 58168568 + 54761392 dialog-control-document dialogcontrol 0 1 0 - 58117544 + 54712416 0 27/6/2005 wbButtonProxy @@ -13717,16 +13633,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 58182736 + 54756640 dialog-control-document sizer 0 1 0 - 58117544 + 54712416 0 27/6/2005 wbFlexGridSizerProxy @@ -13749,16 +13665,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxStaticText: ID_PROXYSOCKSSERVERSTATICCTRL - 58192336 + 54730240 dialog-control-document statictext 0 1 0 - 58182736 + 54756640 0 27/6/2005 wbStaticTextProxy @@ -13806,16 +13722,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 58208480 + 54806464 dialog-control-document sizer 0 1 0 - 58182736 + 54756640 0 27/6/2005 wbFlexGridSizerProxy @@ -13838,16 +13754,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYSOCKSSERVERCTRL - 58218384 + 54817856 dialog-control-document textctrl 0 1 0 - 58208480 + 54806464 0 27/6/2005 wbTextCtrlProxy @@ -13906,16 +13822,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYSOCKSPORTSTATICCTRL - 58239008 + 54843808 dialog-control-document statictext 0 1 0 - 58208480 + 54806464 0 27/6/2005 wbStaticTextProxy @@ -13963,16 +13879,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYSOCKSPORTCTRL - 58255368 + 54864480 dialog-control-document textctrl 0 1 0 - 58208480 + 54806464 0 27/6/2005 wbTextCtrlProxy @@ -14032,16 +13948,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYSOCKSUSERNAMESTATICCTRL - 58275904 + 54858656 dialog-control-document statictext 0 1 0 - 58182736 + 54756640 0 27/6/2005 wbStaticTextProxy @@ -14089,16 +14005,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYSOCKSUSERNAMECTRL - 58291088 + 54900928 dialog-control-document textctrl 0 1 0 - 58182736 + 54756640 0 27/6/2005 wbTextCtrlProxy @@ -14157,16 +14073,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYSOCKSPASSWORDSTATICCTRL - 58311024 + 54896800 dialog-control-document statictext 0 1 0 - 58182736 + 54756640 0 27/6/2005 wbStaticTextProxy @@ -14214,16 +14130,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYSOCKSPASSWORDCTRL - 58327432 + 54943280 dialog-control-document textctrl 0 1 0 - 58182736 + 54756640 0 27/6/2005 wbTextCtrlProxy @@ -14285,16 +14201,16 @@ If you're not sure, click Autodetect. - + wxWizardPage: ID_ERRPROXYCOMPLETIONPAGE - 57883064 + 54960672 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 27/6/2005 wbWizardPageProxy @@ -14329,16 +14245,16 @@ If you're not sure, click Autodetect. -1 - + wxBoxSizer V - 58356808 + 54978976 dialog-control-document sizer 0 1 0 - 57883064 + 54960672 0 27/6/2005 wbBoxSizerProxy @@ -14356,16 +14272,16 @@ If you're not sure, click Autodetect. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 58363200 + 54762864 dialog-control-document statictext 0 1 0 - 58356808 + 54978976 0 27/6/2005 wbStaticTextProxy @@ -14413,16 +14329,16 @@ If you're not sure, click Autodetect. - + wxStaticText: wxID_STATIC - 58379432 + 54998880 dialog-control-document statictext 0 1 0 - 58356808 + 54978976 0 27/6/2005 wbStaticTextProxy @@ -14470,16 +14386,16 @@ If you're not sure, click Autodetect. - + Spacer - 58395656 + 54999600 dialog-control-document spacer 0 1 0 - 58356808 + 54978976 0 27/6/2005 wbSpacerProxy @@ -14500,16 +14416,16 @@ If you're not sure, click Autodetect. - + wxWizardPage: ID_ERRREFCOUNTPAGE - 58401728 + 54979584 dialog-control-document panel 0 1 0 - 33450728 + 52797680 0 9/7/2005 wbWizardPageProxy @@ -14542,16 +14458,16 @@ If you're not sure, click Autodetect. -1 - + wxBoxSizer V - 58411856 + 55027712 dialog-control-document sizer 0 1 0 - 58401728 + 54979584 0 9/7/2005 wbBoxSizerProxy @@ -14569,16 +14485,16 @@ If you're not sure, click Autodetect. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 58419472 + 55040928 dialog-control-document statictext 0 1 0 - 58411856 + 55027712 0 9/7/2005 wbStaticTextProxy @@ -14626,16 +14542,16 @@ If you're not sure, click Autodetect. - + wxStaticText: wxID_STATIC - 58435704 + 55066384 dialog-control-document statictext 0 1 0 - 58411856 + 55027712 0 9/7/2005 wbStaticTextProxy @@ -14683,16 +14599,16 @@ If you're not sure, click Autodetect. - + Spacer - 58451968 + 55062128 dialog-control-document spacer 0 1 0 - 58411856 + 55027712 0 9/7/2005 wbSpacerProxy @@ -14711,16 +14627,16 @@ If you're not sure, click Autodetect. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 58458368 + 55058800 dialog-control-document statictext 0 1 0 - 58411856 + 55027712 0 9/7/2005 wbStaticTextProxy @@ -14770,16 +14686,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxBoxSizer H - 58474576 + 55100480 dialog-control-document sizer 0 1 0 - 58411856 + 55027712 0 9/7/2005 wbBoxSizerProxy @@ -14797,16 +14713,16 @@ so that DialogBlocks doesn't nuke the refences to them. FALSE FALSE <Any platform> - + wxStaticBitmap: wxID_STATIC - 58482216 + 55114352 dialog-control-document staticbitmap 0 1 0 - 58474576 + 55100480 0 11/7/2005 wbStaticBitmapProxy @@ -14848,16 +14764,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 58496152 + 55131280 dialog-control-document staticbitmap 0 1 0 - 58474576 + 55100480 0 11/7/2005 wbStaticBitmapProxy @@ -14899,16 +14815,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 58510128 + 55148304 dialog-control-document staticbitmap 0 1 0 - 58474576 + 55100480 0 11/7/2005 wbStaticBitmapProxy @@ -14950,16 +14866,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 58524104 + 55156976 dialog-control-document staticbitmap 0 1 0 - 58474576 + 55100480 0 11/7/2005 wbStaticBitmapProxy @@ -15001,16 +14917,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 58538080 + 55174000 dialog-control-document staticbitmap 0 1 0 - 58474576 + 55100480 0 9/7/2005 wbStaticBitmapProxy @@ -15052,16 +14968,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 58552072 + 55190784 dialog-control-document staticbitmap 0 1 0 - 58474576 + 55100480 0 9/7/2005 wbStaticBitmapProxy @@ -15108,306 +15024,306 @@ so that DialogBlocks doesn't nuke the refences to them. - + Images - 33281888 + 55185680 html-document bitmapsfolder 1 1 0 - 15072136 + 14634464 1 - + boincsm.xpm - 33458608 + 55192784 image-document res/boincsm.xpm image 0 0 0 - 33281888 + 55185680 0 1/3/2005 100 - + boinc.xpm - 33468424 + 55192544 image-document res/boinc.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + boinc_mac.xpm - 33468568 + 55192336 image-document res/boinc_mac.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + BOINCGUIApp.xpm - 33518176 + 55192128 image-document res/BOINCGUIApp.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + connect.xpm - 33518320 + 55191920 image-document res/connect.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + disconnect.xpm - 33518464 + 55191712 image-document res/disconnect.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + mess.xpm - 58565880 + 55191504 image-document res/mess.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + proj.xpm - 58566024 + 55191296 image-document res/proj.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + result.xpm - 58566168 + 55193200 image-document res/result.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + usage.xpm - 58566312 + 55207824 image-document res/usage.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + xfer.xpm - 58566592 + 55207584 image-document res/xfer.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + attachprojectwizard.xpm - 58566872 + 55207408 image-document res/attachprojectwizard.xpm image 0 0 0 - 33281888 + 55185680 0 21/6/2005 100 - + wizfailure.xpm - 58567152 + 55207200 image-document res/wizfailure.xpm image 0 0 0 - 33281888 + 55185680 0 25/6/2005 100 - + wizsuccess.xpm - 58567432 + 55206960 image-document res/wizsuccess.xpm image 0 0 0 - 33281888 + 55185680 0 25/6/2005 100 - + wizprogress1.xpm - 58567712 + 55206752 image-document res/wizprogress1.xpm image 0 0 0 - 33281888 + 55185680 0 11/7/2005 100 - + wizprogress2.xpm - 58567992 + 55206544 image-document res/wizprogress2.xpm image 0 0 0 - 33281888 + 55185680 0 11/7/2005 100 - + wizprogress3.xpm - 58568272 + 55206336 image-document res/wizprogress3.xpm image 0 0 0 - 33281888 + 55185680 0 11/7/2005 100 - + wizprogress4.xpm - 58568552 + 55206128 image-document res/wizprogress4.xpm image 0 0 0 - 33281888 + 55185680 0 11/7/2005 100 - + Sources - 58568816 + 55185520 html-document sourcesfolder 1 1 0 - 15072136 + 14634464 1 10/2/2005 - + ValidateAccountKey.cpp - 58569000 + 55213808 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 58568816 + 55185520 0 29/2/2005 - + ValidateURL.cpp - 58569208 + 55213552 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 58568816 + 55185520 0 29/2/2005 diff --git a/clientgui/WizAttachProject.cpp b/clientgui/WizAttachProject.cpp index 7d46fbe362..471b3db4f1 100644 --- a/clientgui/WizAttachProject.cpp +++ b/clientgui/WizAttachProject.cpp @@ -67,11 +67,8 @@ IMPLEMENT_DYNAMIC_CLASS( CWizAttachProject, wxWizard ) BEGIN_EVENT_TABLE( CWizAttachProject, wxWizard ) - EVT_BUTTON(wxID_BACKWARD, CWizAttachProject::OnWizardBack) - EVT_BUTTON(wxID_FORWARD, CWizAttachProject::OnWizardNext) - ////@begin CWizAttachProject event table entries ////@end CWizAttachProject event table entries @@ -119,9 +116,7 @@ bool CWizAttachProject::Create( wxWindow* parent, wxWindowID id, const wxPoint& // Button pointer cache - m_pbtnBack = NULL; - m_pbtnNext = NULL; // Wizard support @@ -155,8 +150,6 @@ void CWizAttachProject::CreateControls() wxLogTrace(wxT("Function Start/End"), wxT("CWizAttachProject::CreateControls - Function Begin")); ////@begin CWizAttachProject content construction - // Generated by DialogBlocks, 08/12/05 16:58:33 (unregistered) - wxWizard* itemWizard1 = this; m_WelcomePage = new CWelcomePage; @@ -315,62 +308,37 @@ wxIcon CWizAttachProject::GetIconResource( const wxString& name ) ////@end CWizAttachProject icon retrieval } - /*! - * Determine if the wizard page has a next page - */ - bool CWizAttachProject::HasNextPage( wxWizardPage* page ) - { - bool bNoNextPageDetected = false; - bNoNextPageDetected |= (page == m_CompletionPage); - bNoNextPageDetected |= (page == m_CompletionErrorPage); - bNoNextPageDetected |= (page == m_ErrProjectNotDetectedPage); - bNoNextPageDetected |= (page == m_ErrProjectUnavailablePage); - bNoNextPageDetected |= (page == m_ErrNoInternetConnectionPage); - bNoNextPageDetected |= (page == m_ErrAccountAlreadyExistsPage); - bNoNextPageDetected |= (page == m_ErrAccountCreationDisabledPage); - if (bNoNextPageDetected) - return false; - return true; - } /*! - * Determine if the wizard page has a previous page - */ - bool CWizAttachProject::HasPrevPage( wxWizardPage* page ) - { - if ((page == m_WelcomePage) || (page == m_CompletionErrorPage)) - return false; - return true; - } /*! @@ -398,162 +366,95 @@ bool CWizAttachProject::IsDiagFlagsSet( unsigned long ulFlags ) * Remove the page transition to the stack. */ - wxWizardPage* CWizAttachProject::PopPageTransition() { - wxWizardPage* pPage = NULL; - if (GetCurrentPage()) { - if (m_PageTransition.size() > 0) { - pPage = m_PageTransition.top(); - m_PageTransition.pop(); - if ((pPage == m_ProjectPropertiesPage) || (pPage == m_AccountCreationPage)) { - // We want to go back to the page before we attempted to communicate - // with any server. - pPage = m_PageTransition.top(); - m_PageTransition.pop(); - } wxASSERT(pPage); - return pPage; - } - } - return NULL; - } /*! * Add the page transition to the stack. */ -wxWizardPage* CWizAttachProject::PushPageTransition( wxWizardPage* pCurrentPage, unsigned long ulPageID ) - -{ - +wxWizardPage* CWizAttachProject::PushPageTransition( wxWizardPage* pCurrentPage, unsigned long ulPageID ) { if (GetCurrentPage()) { - wxWizardPage* pPage = NULL; - if (ID_WELCOMEPAGE == ulPageID) - pPage = m_WelcomePage; - if (ID_PROJECTINFOPAGE == ulPageID) - pPage = m_ProjectInfoPage; - if (ID_PROJECTPROPERTIESPAGE == ulPageID) - pPage = m_ProjectPropertiesPage; - if (ID_ACCOUNTINFOPAGE == ulPageID) - pPage = m_AccountInfoPage; - if (ID_ACCOUNTKEYPAGE == ulPageID) - pPage = m_AccountKeyPage; - if (ID_ACCOUNTCREATIONPAGE == ulPageID) - pPage = m_AccountCreationPage; - if (ID_COMPLETIONPAGE == ulPageID) - pPage = m_CompletionPage; - if (ID_COMPLETIONERRORPAGE == ulPageID) - pPage = m_CompletionErrorPage; - if (ID_ERRPROJECTNOTDETECTEDPAGE == ulPageID) - pPage = m_ErrProjectNotDetectedPage; - if (ID_ERRPROJECTUNAVAILABLEPAGE == ulPageID) - pPage = m_ErrProjectUnavailablePage; - if (ID_ERRNOINTERNETCONNECTIONPAGE == ulPageID) - pPage = m_ErrNoInternetConnectionPage; - if (ID_ERRACCOUNTALREADYEXISTSPAGE == ulPageID) - pPage = m_ErrAccountAlreadyExistsPage; - if (ID_ERRACCOUNTCREATIONDISABLEDPAGE == ulPageID) - pPage = m_ErrAccountCreationDisabledPage; - if (ID_ERRPROXYINFOPAGE == ulPageID) - pPage = m_ErrProxyInfoPage; - if (ID_ERRPROXYHTTPPAGE == ulPageID) - pPage = m_ErrProxyHTTPPage; - if (ID_ERRPROXYSOCKSPAGE == ulPageID) - pPage = m_ErrProxySOCKSPage; - if (ID_ERRPROXYCOMPLETIONPAGE == ulPageID) - pPage = m_ErrProxyCompletionPage; - if (pPage) { - if ((pCurrentPage == m_WelcomePage) && (m_PageTransition.size() == 0)) { - m_PageTransition.push(NULL); - } - if (m_PageTransition.top() != pCurrentPage) { - m_PageTransition.push(pCurrentPage); - } - return pPage; - } - } - return NULL; - } @@ -600,29 +501,21 @@ void CWizAttachProject::ProcessCancelEvent( wxWizardEvent& event ) { event.Veto(); } } - } - void CWizAttachProject::SimulateNextButton() { - if (!GetNextButton()) return; wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetNextButton()->GetId()); - event.SetEventObject(GetNextButton()); AddPendingEvent(event); - } void CWizAttachProject::SimulateBackButton() { - if (!GetBackButton()) return; wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetBackButton()->GetId()); - event.SetEventObject(GetNextButton()); AddPendingEvent(event); - } /*! @@ -712,8 +605,6 @@ bool CWelcomePage::Create( wxWizard* parent ) void CWelcomePage::CreateControls() { ////@begin CWelcomePage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CWelcomePage* itemWizardPage2 = this; wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); @@ -863,124 +754,70 @@ wxIcon CWelcomePage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_WELCOMEPAGE - */ - void CWelcomePage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_PAGE_CHANGING event handler for ID_WELCOMEPAGE - */ - - void CWelcomePage::OnPageChanging( wxWizardEvent& event ) - { - if (event.GetDirection() == false) return; - unsigned long ulFlags = 0; - #if defined(__WXDEBUG__) - if (m_ErrProjectPropertiesCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRPROJECTPROPERTIES; - #endif - #if defined(__WXDEBUG__) - if (m_ErrProjectPropertiesURLCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRPROJECTPROPERTIESURL; - #endif - #if defined(__WXDEBUG__) - if (m_ErrProjectCommCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRPROJECTCOMM; - #endif - #if defined(__WXDEBUG__) - if (m_ErrGoogleCommCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRGOOGLECOMM; - #endif - #if defined(__WXDEBUG__) - if (m_ErrYahooCommCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRYAHOOCOMM; - #endif - #if defined(__WXDEBUG__) - if (m_ErrAccountAlreadyExistsCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRACCOUNTALREADYEXISTS; - #endif - #if defined(__WXDEBUG__) - if (m_ErrAccountCreationDisabledCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRACCOUNTCREATIONDISABLED; - #endif - #if defined(__WXDEBUG__) - if (m_ErrClientAccountCreationDisabledCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRCLIENTACCOUNTCREATIONDISABLED; - #endif - #if defined(__WXDEBUG__) - if (m_ErrNetDetectionCtrl->GetValue()) - ulFlags |= WIZDEBUG_ERRNETDETECTION; - #endif - ((CWizAttachProject*)GetParent())->SetDiagFlags( ulFlags ); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_WELCOMEPAGE - */ - void CWelcomePage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! @@ -1045,8 +882,6 @@ bool CProjectInfoPage::Create( wxWizard* parent ) void CProjectInfoPage::CreateControls() { ////@begin CProjectInfoPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CProjectInfoPage* itemWizardPage21 = this; wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxVERTICAL); @@ -1155,48 +990,34 @@ wxIcon CProjectInfoPage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_PROJECTINFOPAGE - */ - void CProjectInfoPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_PAGE_CHANGING event handler for ID_PROJECTINFOPAGE - */ - void CProjectInfoPage::OnPageChanging( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_PROJECTINFOPAGE - */ - - void CProjectInfoPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! * CProjectPropertiesPage custom event definition */ + DEFINE_EVENT_TYPE(wxEVT_PROJECTPROPERTIES_STATECHANGE) @@ -1277,8 +1098,6 @@ bool CProjectPropertiesPage::Create( wxWizard* parent ) void CProjectPropertiesPage::CreateControls() { ////@begin CProjectPropertiesPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CProjectPropertiesPage* itemWizardPage34 = this; wxBoxSizer* itemBoxSizer35 = new wxBoxSizer(wxVERTICAL); @@ -1378,65 +1197,35 @@ wxBitmap CProjectPropertiesPage::GetBitmapResource( const wxString& name ) // Bitmap retrieval if (name == wxT("res/wizprogress1.xpm")) - { - wxBitmap bitmap(wizprogress1_xpm); - return bitmap; - } - else if (name == wxT("res/wizprogress2.xpm")) - { - wxBitmap bitmap(wizprogress2_xpm); - return bitmap; - } - else if (name == wxT("res/wizprogress3.xpm")) - { - wxBitmap bitmap(wizprogress3_xpm); - return bitmap; - } - else if (name == wxT("res/wizprogress4.xpm")) - { - wxBitmap bitmap(wizprogress4_xpm); - return bitmap; - } - else if (name == wxT("res/wizfailure.xpm")) - { - wxBitmap bitmap(wizfailure_xpm); - return bitmap; - } - else if (name == wxT("res/wizsuccess.xpm")) - { - wxBitmap bitmap(wizsuccess_xpm); - return bitmap; - } - return wxNullBitmap; } @@ -1460,19 +1249,12 @@ void CProjectPropertiesPage::OnPageChanged( wxWizardEvent& event ) { if (event.GetDirection() == false) return; - SetProjectPropertiesSucceeded(false); - SetProjectPropertiesURLFailure(false); - SetProjectAccountCreationDisabled(false); - SetProjectClientAccountCreationDisabled(false); - SetCommunicateYahooSucceeded(false); - SetCommunicateGoogleSucceeded(false); - SetDeterminingConnectionStatusSucceeded(false); SetNextState(PROJPROP_INIT); @@ -1482,14 +1264,9 @@ void CProjectPropertiesPage::OnPageChanged( wxWizardEvent& event ) /*! - * wxEVT_WIZARD_CANCEL event handler for ID_PROJECTPROPERTIESPAGE - */ - - void CProjectPropertiesPage::OnCancel( wxWizardEvent& event ) { - } /*! @@ -1542,7 +1319,6 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIES)) { SetProjectPropertiesSucceeded(true); - bSuccessfulCondition = pc->account_creation_disabled; if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTCREATIONDISABLED)) { SetProjectAccountCreationDisabled(true); @@ -1550,7 +1326,6 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) SetProjectAccountCreationDisabled(false); } - bSuccessfulCondition = pc->client_account_creation_disabled; if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRCLIENTACCOUNTCREATIONDISABLED)) { SetProjectClientAccountCreationDisabled(true); @@ -1558,7 +1333,6 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) SetProjectClientAccountCreationDisabled(false); } - SetNextState(PROJPROP_CLEANUP); } else { SetProjectPropertiesSucceeded(false); @@ -1658,75 +1432,52 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) /*! - * CAccountKeyPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CAccountKeyPage, wxWizardPage ) - /*! - * CAccountKeyPage event table definition - */ - BEGIN_EVENT_TABLE( CAccountKeyPage, wxWizardPage ) - ////@begin CAccountKeyPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CAccountKeyPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CAccountKeyPage::OnCancel ) ////@end CAccountKeyPage event table entries - END_EVENT_TABLE() /*! - * CAccountKeyPage constructors - */ - CAccountKeyPage::CAccountKeyPage( ) - { - } CAccountKeyPage::CAccountKeyPage( wxWizard* parent ) - { - Create( parent ); - } /*! - * CAuthenticatorPage creator - */ - bool CAccountKeyPage::Create( wxWizard* parent ) - { - ////@begin CAccountKeyPage member initialisation m_AccountKeyStaticCtrl = NULL; m_AccountKeyCtrl = NULL; ////@end CAccountKeyPage member initialisation - ////@begin CAccountKeyPage creation wxBitmap wizardBitmap(wxNullBitmap); wxWizardPage::Create( parent, wizardBitmap ); @@ -1734,26 +1485,18 @@ bool CAccountKeyPage::Create( wxWizard* parent ) CreateControls(); GetSizer()->Fit(this); ////@end CAccountKeyPage creation - return TRUE; - } /*! - * Control creation for CAuthenticatorPage - */ - void CAccountKeyPage::CreateControls() - { ////@begin CAccountKeyPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CAccountKeyPage* itemWizardPage40 = this; wxBoxSizer* itemBoxSizer41 = new wxBoxSizer(wxVERTICAL); @@ -1805,29 +1548,20 @@ void CAccountKeyPage::CreateControls() /*! - * Gets the previous page. - */ - wxWizardPage* CAccountKeyPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } /*! - * Gets the next page. - */ - wxWizardPage* CAccountKeyPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -1836,90 +1570,61 @@ wxWizardPage* CAccountKeyPage::GetNext() const return PAGE_TRANSITION_NEXT(ID_COMPLETIONPAGE); } return NULL; - } - /*! - * Should we show tooltips? - */ - bool CAccountKeyPage::ShowToolTips() - { - return TRUE; - } /*! - * Get bitmap resources - */ - wxBitmap CAccountKeyPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CAccountKeyPage bitmap retrieval return wxNullBitmap; ////@end CAccountKeyPage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CAccountKeyPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CAccountKeyPage icon retrieval return wxNullIcon; ////@end CAccountKeyPage icon retrieval - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ACCOUNTKEYPAGE - */ - void CAccountKeyPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ACCOUNTKEYPAGE - */ - void CAccountKeyPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! @@ -1994,8 +1699,6 @@ bool CAccountInfoPage::Create( wxWizard* parent ) void CAccountInfoPage::CreateControls() { ////@begin CAccountInfoPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CAccountInfoPage* itemWizardPage52 = this; wxBoxSizer* itemBoxSizer53 = new wxBoxSizer(wxVERTICAL); @@ -2120,143 +1823,89 @@ wxIcon CAccountInfoPage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ACCOUNTINFOPAGE - */ - void CAccountInfoPage::OnPageChanged( wxWizardEvent& event ) - { - if (event.GetDirection() == false) return; - if (((CWizAttachProject*)GetParent())->project_config.uses_username) { - m_AccountEmailAddressStaticCtrl->SetLabel( - _("Username:") - ); } else { - m_AccountEmailAddressStaticCtrl->SetLabel( - _("Email address:") - ); } Fit(); - } /*! - * wxEVT_WIZARD_PAGE_CHANGING event handler for ID_ACCOUNTINFOPAGE - */ - void CAccountInfoPage::OnPageChanging( wxWizardEvent& event ) - { - if (event.GetDirection() == false) return; if (!((CWizAttachProject*)GetParent())->IsCancelInProgress()) { wxString strTitle = _("Attach to Project Wizard"); - wxString strMessage = wxT(""); - bool bDisplayError = false; - // Validate a new account against the account creation policies - if (m_AccountCreateCtrl->GetValue()) { - // Verify minimum password length - unsigned int iMinLength = ((CWizAttachProject*)GetParent())->project_config.min_passwd_length; - wxString strPassword = m_AccountPasswordCtrl->GetValue(); - if (strPassword.Length() < iMinLength) { - strMessage.Printf( - _("The minimum password length for this project is %d. Please choose a different password."), - iMinLength - ); - bDisplayError = true; - } - // Verify that the password and confirmation password math. - if (m_AccountPasswordCtrl->GetValue() != m_AccountConfirmPasswordCtrl->GetValue()) { - strMessage = _("The password and confirmation password do not match. Please type them again."); - bDisplayError = true; - } - } - if (bDisplayError) { - ::wxMessageBox( - strMessage, - strTitle, - wxICON_ERROR | wxOK, - this - ); - event.Veto(); - } - } - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ACCOUNTINFOPAGE - */ - void CAccountInfoPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_ACCOUNTUSEXISTINGBUTTON */ -void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event ) -{ +void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event ) { m_AccountConfirmPasswordStaticCtrl->Hide(); m_AccountConfirmPasswordCtrl->Hide(); } @@ -2266,8 +1915,7 @@ void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event ) * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_ACCOUNTCREATEBUTTON */ -void CAccountInfoPage::OnAccountCreateCtrlSelected( wxCommandEvent& event ) -{ +void CAccountInfoPage::OnAccountCreateCtrlSelected( wxCommandEvent& event ) { m_AccountConfirmPasswordStaticCtrl->Show(); m_AccountConfirmPasswordCtrl->Show(); } @@ -2278,71 +1926,49 @@ void CAccountInfoPage::OnAccountCreateCtrlSelected( wxCommandEvent& event ) DEFINE_EVENT_TYPE(wxEVT_ACCOUNTCREATION_STATECHANGE) - /*! - * CAccountCreationPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CAccountCreationPage, wxWizardPage ) /*! - * CAccountCreationPage event table definition - */ - BEGIN_EVENT_TABLE( CAccountCreationPage, wxWizardPage ) EVT_ACCOUNTCREATION_STATECHANGE( CAccountCreationPage::OnStateChange ) - ////@begin CAccountCreationPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CAccountCreationPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CAccountCreationPage::OnCancel ) - ////@end CAccountCreationPage event table entries - END_EVENT_TABLE() /*! - * CAccountCreationPage constructors - */ - CAccountCreationPage::CAccountCreationPage( ) - { - } CAccountCreationPage::CAccountCreationPage( wxWizard* parent ) - { - Create( parent ); - } /*! - * CProjectPropertiesPage creator - */ - bool CAccountCreationPage::Create( wxWizard* parent ) - { ////@begin CAccountCreationPage member initialisation @@ -2352,15 +1978,11 @@ bool CAccountCreationPage::Create( wxWizard* parent ) ////@end CAccountCreationPage member initialisation m_bProjectCommunitcationsSucceeded = false; - m_bProjectUnavailable = false; - m_bProjectAccountAlreadyExists = false; m_iCurrentState = ACCOUNTCREATION_INIT; - m_iProjectCommunitcationsProgressImage = 0; - ////@begin CAccountCreationPage creation wxBitmap wizardBitmap(wxNullBitmap); wxWizardPage::Create( parent, wizardBitmap ); @@ -2370,24 +1992,16 @@ bool CAccountCreationPage::Create( wxWizard* parent ) ////@end CAccountCreationPage creation return TRUE; - } - /*! - * Control creation for CProjectPropertiesPage - */ - void CAccountCreationPage::CreateControls() - { ////@begin CAccountCreationPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CAccountCreationPage* itemWizardPage67 = this; wxBoxSizer* itemBoxSizer68 = new wxBoxSizer(wxVERTICAL); @@ -2417,34 +2031,24 @@ void CAccountCreationPage::CreateControls() itemBoxSizer68->Add(m_FinalAccountCreationStatusCtrl, 0, wxALIGN_LEFT|wxALL, 5); ////@end CAccountCreationPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CAccountCreationPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } /*! - * Gets the next page. - */ - wxWizardPage* CAccountCreationPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -2461,23 +2065,16 @@ wxWizardPage* CAccountCreationPage::GetNext() const } return NULL; - } /*! - * Should we show tooltips? - */ - bool CAccountCreationPage::ShowToolTips() - { - return TRUE; - } void CAccountCreationPage::SetupProgressImage(wxStaticBitmap* pImage, int& iImageIndex) { @@ -2499,116 +2096,69 @@ void CAccountCreationPage::IncrementProgressImage(wxStaticBitmap* pImage, int& i /*! - * Get bitmap resources - */ - wxBitmap CAccountCreationPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval - if (name == wxT("res/wizprogress1.xpm")) - { - wxBitmap bitmap(wizprogress1_xpm); - return bitmap; - } - else if (name == wxT("res/wizprogress2.xpm")) - { - wxBitmap bitmap(wizprogress2_xpm); - return bitmap; - } - else if (name == wxT("res/wizprogress3.xpm")) - { - wxBitmap bitmap(wizprogress3_xpm); - return bitmap; - } - else if (name == wxT("res/wizprogress4.xpm")) - { - wxBitmap bitmap(wizprogress4_xpm); - return bitmap; - } - else if (name == wxT("res/wizfailure.xpm")) - { - wxBitmap bitmap(wizfailure_xpm); - return bitmap; - } - else if (name == wxT("res/wizsuccess.xpm")) - { - wxBitmap bitmap(wizsuccess_xpm); - return bitmap; - } return wxNullBitmap; - } /*! - * Get icon resources - */ - wxIcon CAccountCreationPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CAccountCreationPage icon retrieval return wxNullIcon; ////@end CAccountCreationPage icon retrieval - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ACCOUNTCREATIONPAGE - */ - void CAccountCreationPage::OnPageChanged( wxWizardEvent& event ) - { if (event.GetDirection() == false) return; - SetProjectCommunitcationsSucceeded(false); SetProjectUnavailable(false); SetProjectAccountAlreadyExists(false); @@ -2616,20 +2166,15 @@ void CAccountCreationPage::OnPageChanged( wxWizardEvent& event ) CAccountCreationPageEvent TransitionEvent(wxEVT_ACCOUNTCREATION_STATECHANGE, this); AddPendingEvent(TransitionEvent); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ACCOUNTCREATIONPAGE - */ - void CAccountCreationPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! @@ -2759,25 +2304,17 @@ void CAccountCreationPage::OnStateChange( CAccountCreationPageEvent& event ) /*! - * CCompletionPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CCompletionPage, wxWizardPage ) - /*! - * CCompletionPage event table definition - */ - BEGIN_EVENT_TABLE( CCompletionPage, wxWizardPage ) - ////@begin CCompletionPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CCompletionPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CCompletionPage::OnCancel ) @@ -2785,48 +2322,31 @@ BEGIN_EVENT_TABLE( CCompletionPage, wxWizardPage ) ////@end CCompletionPage event table entries - END_EVENT_TABLE() /*! - * CCompletionPage constructors - */ - CCompletionPage::CCompletionPage( ) - { - } - CCompletionPage::CCompletionPage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CCompletionPage creator - */ - bool CCompletionPage::Create( wxWizard* parent ) - { - ////@begin CCompletionPage member initialisation ////@end CCompletionPage member initialisation - ////@begin CCompletionPage creation wxBitmap wizardBitmap(wxNullBitmap); wxWizardPage::Create( parent, wizardBitmap ); @@ -2836,24 +2356,17 @@ bool CCompletionPage::Create( wxWizard* parent ) ////@end CCompletionPage creation return TRUE; - } /*! - * Control creation for CCompletionPage - */ - void CCompletionPage::CreateControls() - { ////@begin CCompletionPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CCompletionPage* itemWizardPage75 = this; wxBoxSizer* itemBoxSizer76 = new wxBoxSizer(wxVERTICAL); @@ -2875,131 +2388,87 @@ void CCompletionPage::CreateControls() itemBoxSizer76->Add(itemStaticText80, 0, wxALIGN_LEFT|wxALL, 5); ////@end CCompletionPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CCompletionPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } - /*! - * Gets the next page. - */ - wxWizardPage* CCompletionPage::GetNext() const - { - return NULL; - } /*! - * Should we show tooltips? - */ - bool CCompletionPage::ShowToolTips() - { - return TRUE; - } /*! - * Get bitmap resources - */ - wxBitmap CCompletionPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CCompletionPage bitmap retrieval return wxNullBitmap; ////@end CCompletionPage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CCompletionPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CCompletionPage icon retrieval return wxNullIcon; ////@end CCompletionPage icon retrieval - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_COMPLETIONPAGE - */ - void CCompletionPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_COMPLETIONPAGE - */ - void CCompletionPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } - /*! - * wxEVT_WIZARD_FINISHED event handler for ID_COMPLETIONPAGE - */ - void CCompletionPage::OnFinished( wxWizardEvent& event ) { #if 0 CMainDocument* pDoc = wxGetApp().GetDocument(); @@ -3007,87 +2476,47 @@ void CCompletionPage::OnFinished( wxWizardEvent& event ) { wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); - // If the wizard was successful and everything is cool, tell the - // core client to attach to the project with the authenticator. - if ( m_AccountCreationPage->GetProjectCommunitcationsSucceeded() && - account_out.authenticator.length() > 0 && - account_in.url.length() > 0 - ) - { - pDoc->rpc.project_attach( - account_in.url.c_str(), - account_out.authenticator.c_str() - ); - } else { - #if defined(__WXDEBUG__) - if (!m_AccountCreationPage->GetProjectCommunitcationsSucceeded()) { - ::wxMessageBox( - wxT("m_AccountCreationPage->GetProjectCommunitcationsSucceeded() = false"), - wxT("Attach to Project Wizard"), - wxICON_ERROR | wxOK, - this - ); - } else if (account_in.url.length() == 0) { - ::wxMessageBox( - wxT("account_in.url.length() == 0"), - wxT("Attach to Project Wizard"), - wxICON_ERROR | wxOK, - this - ); - } else if (account_out.authenticator.length() == 0) { - ::wxMessageBox( - wxT("account_out.authenticator.length() == 0"), - wxT("Attach to Project Wizard"), - wxICON_ERROR | wxOK, - this - ); - } - #endif - } - #endif // Let the framework clean everything up. - event.Skip(); - } /*! @@ -3149,8 +2578,6 @@ bool CCompletionErrorPage::Create( wxWizard* parent ) void CCompletionErrorPage::CreateControls() { ////@begin CCompletionErrorPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) - CCompletionErrorPage* itemWizardPage81 = this; wxBoxSizer* itemBoxSizer82 = new wxBoxSizer(wxVERTICAL); @@ -3163,11 +2590,9 @@ void CCompletionErrorPage::CreateControls() itemBoxSizer82->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer82->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText86 = new wxStaticText; - itemStaticText86->Create( itemWizardPage81, wxID_STATIC, _("Click Finish to close."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer82->Add(itemStaticText86, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText85 = new wxStaticText; + itemStaticText85->Create( itemWizardPage81, wxID_STATIC, _("Click Finish to close."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer82->Add(itemStaticText85, 0, wxALIGN_LEFT|wxALL, 5); ////@end CCompletionErrorPage content construction } @@ -3225,29 +2650,19 @@ wxIcon CCompletionErrorPage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_COMPLETIONERRORPAGE - */ - void CCompletionErrorPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } - /*! - * wxEVT_WIZARD_CANCEL event handler for ID_COMPLETIONERRORPAGE - */ - void CCompletionErrorPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! @@ -3309,27 +2724,25 @@ bool CErrProjectNotDetectedPage::Create( wxWizard* parent ) void CErrProjectNotDetectedPage::CreateControls() { ////@begin CErrProjectNotDetectedPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrProjectNotDetectedPage* itemWizardPage86 = this; - CErrProjectNotDetectedPage* itemWizardPage87 = this; + wxBoxSizer* itemBoxSizer87 = new wxBoxSizer(wxVERTICAL); + itemWizardPage86->SetSizer(itemBoxSizer87); - wxBoxSizer* itemBoxSizer88 = new wxBoxSizer(wxVERTICAL); - itemWizardPage87->SetSizer(itemBoxSizer88); + wxStaticText* itemStaticText88 = new wxStaticText; + itemStaticText88->Create( itemWizardPage86, wxID_STATIC, _("Project not found"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText88->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer87->Add(itemStaticText88, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText89 = new wxStaticText; - itemStaticText89->Create( itemWizardPage87, wxID_STATIC, _("Project not found"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText89->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer88->Add(itemStaticText89, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer87->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer88->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText90 = new wxStaticText; + itemStaticText90->Create( itemWizardPage86, wxID_STATIC, _("The URL you supplied is not that of a BOINC-based project."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer87->Add(itemStaticText90, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText91 = new wxStaticText; - itemStaticText91->Create( itemWizardPage87, wxID_STATIC, _("The URL you supplied is not that of a BOINC-based project."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer88->Add(itemStaticText91, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText92 = new wxStaticText; - itemStaticText92->Create( itemWizardPage87, wxID_STATIC, _("Please check the URL and try again."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer88->Add(itemStaticText92, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText91->Create( itemWizardPage86, wxID_STATIC, _("Please check the URL and try again."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer87->Add(itemStaticText91, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProjectNotDetectedPage content construction } @@ -3391,100 +2804,67 @@ wxIcon CErrProjectNotDetectedPage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRPROJECTNOTDETECTEDPAGE - */ - void CErrProjectNotDetectedPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRPROJECTNOTDETECTEDPAGE - */ - void CErrProjectNotDetectedPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! - * CErrProjectUnavailablePage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrProjectUnavailablePage, wxWizardPage ) - /*! - * CErrProjectUnavailablePage event table definition - */ - BEGIN_EVENT_TABLE( CErrProjectUnavailablePage, wxWizardPage ) - ////@begin CErrProjectUnavailablePage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CErrProjectUnavailablePage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CErrProjectUnavailablePage::OnCancel ) ////@end CErrProjectUnavailablePage event table entries - END_EVENT_TABLE() /*! - * CErrProjectUnavailablePage constructors - */ - CErrProjectUnavailablePage::CErrProjectUnavailablePage( ) - { - } CErrProjectUnavailablePage::CErrProjectUnavailablePage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CErrProjectUnavailablePage creator - */ - bool CErrProjectUnavailablePage::Create( wxWizard* parent ) - { - ////@begin CErrProjectUnavailablePage member initialisation ////@end CErrProjectUnavailablePage member initialisation - ////@begin CErrProjectUnavailablePage creation wxBitmap wizardBitmap(wxNullBitmap); wxWizardPage::Create( parent, wizardBitmap ); @@ -3494,164 +2874,113 @@ bool CErrProjectUnavailablePage::Create( wxWizard* parent ) ////@end CErrProjectUnavailablePage creation return TRUE; - } /*! - * Control creation for CErrProjectUnavailablePage - */ - void CErrProjectUnavailablePage::CreateControls() - { - ////@begin CErrProjectUnavailablePage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrProjectUnavailablePage* itemWizardPage92 = this; - CErrProjectUnavailablePage* itemWizardPage93 = this; + wxBoxSizer* itemBoxSizer93 = new wxBoxSizer(wxVERTICAL); + itemWizardPage92->SetSizer(itemBoxSizer93); - wxBoxSizer* itemBoxSizer94 = new wxBoxSizer(wxVERTICAL); - itemWizardPage93->SetSizer(itemBoxSizer94); + wxStaticText* itemStaticText94 = new wxStaticText; + itemStaticText94->Create( itemWizardPage92, wxID_STATIC, _("Project temporarily unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText94->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer93->Add(itemStaticText94, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText95 = new wxStaticText; - itemStaticText95->Create( itemWizardPage93, wxID_STATIC, _("Project temporarily unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText95->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer94->Add(itemStaticText95, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer93->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer94->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText97 = new wxStaticText; - itemStaticText97->Create( itemWizardPage93, wxID_STATIC, _("The project is currently unavailable.\nPlease try again later."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer94->Add(itemStaticText97, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText96 = new wxStaticText; + itemStaticText96->Create( itemWizardPage92, wxID_STATIC, _("The project is currently unavailable.\nPlease try again later."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer93->Add(itemStaticText96, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProjectUnavailablePage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CErrProjectUnavailablePage::GetPrev() const - { - return PAGE_TRANSITION_BACK; - } - /*! - * Gets the next page. - */ - wxWizardPage* CErrProjectUnavailablePage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE); } return NULL; - } - /*! - * Should we show tooltips? - */ - bool CErrProjectUnavailablePage::ShowToolTips() - { - return TRUE; - } /*! - * Get bitmap resources - */ - wxBitmap CErrProjectUnavailablePage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrProjectUnavailablePage bitmap retrieval return wxNullBitmap; ////@end CErrProjectUnavailablePage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CErrProjectUnavailablePage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CErrProjectUnavailablePage icon retrieval return wxNullIcon; ////@end CErrProjectUnavailablePage icon retrieval - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRPROJECTUNAVAILABLEPAGE - */ - void CErrProjectUnavailablePage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } - /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRPROJECTUNAVAILABLEPAGE - */ - void CErrProjectUnavailablePage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } - /*! * CErrNoInternetConnectionPage type definition */ @@ -3711,23 +3040,21 @@ bool CErrNoInternetConnectionPage::Create( wxWizard* parent ) void CErrNoInternetConnectionPage::CreateControls() { ////@begin CErrNoInternetConnectionPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrNoInternetConnectionPage* itemWizardPage97 = this; - CErrNoInternetConnectionPage* itemWizardPage98 = this; + wxBoxSizer* itemBoxSizer98 = new wxBoxSizer(wxVERTICAL); + itemWizardPage97->SetSizer(itemBoxSizer98); - wxBoxSizer* itemBoxSizer99 = new wxBoxSizer(wxVERTICAL); - itemWizardPage98->SetSizer(itemBoxSizer99); + wxStaticText* itemStaticText99 = new wxStaticText; + itemStaticText99->Create( itemWizardPage97, wxID_STATIC, _("No Internet connection"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText99->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer98->Add(itemStaticText99, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText100 = new wxStaticText; - itemStaticText100->Create( itemWizardPage98, wxID_STATIC, _("No Internet connection"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText100->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer99->Add(itemStaticText100, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer98->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer99->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText102 = new wxStaticText; - itemStaticText102->Create( itemWizardPage98, wxID_STATIC, _("Please connect to the Internet and try again."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer99->Add(itemStaticText102, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText101 = new wxStaticText; + itemStaticText101->Create( itemWizardPage97, wxID_STATIC, _("Please connect to the Internet and try again."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer98->Add(itemStaticText101, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrNoInternetConnectionPage content construction } @@ -3789,29 +3116,20 @@ wxIcon CErrNoInternetConnectionPage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRNOINTERNETCONNECTIONPAGE - */ - void CErrNoInternetConnectionPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRNOINTERNETCONNECTIONPAGE - */ - void CErrNoInternetConnectionPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! @@ -3873,23 +3191,21 @@ bool CErrAccountAlreadyExistsPage::Create( wxWizard* parent ) void CErrAccountAlreadyExistsPage::CreateControls() { ////@begin CErrAccountAlreadyExistsPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrAccountAlreadyExistsPage* itemWizardPage102 = this; - CErrAccountAlreadyExistsPage* itemWizardPage103 = this; + wxBoxSizer* itemBoxSizer103 = new wxBoxSizer(wxVERTICAL); + itemWizardPage102->SetSizer(itemBoxSizer103); - wxBoxSizer* itemBoxSizer104 = new wxBoxSizer(wxVERTICAL); - itemWizardPage103->SetSizer(itemBoxSizer104); + wxStaticText* itemStaticText104 = new wxStaticText; + itemStaticText104->Create( itemWizardPage102, wxID_STATIC, _("Email address already in use"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText104->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer103->Add(itemStaticText104, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText105 = new wxStaticText; - itemStaticText105->Create( itemWizardPage103, wxID_STATIC, _("Email address already in use"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText105->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer104->Add(itemStaticText105, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer103->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer104->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText107 = new wxStaticText; - itemStaticText107->Create( itemWizardPage103, wxID_STATIC, _("An account with that email address already exists\nand has a different password than the one you entered.\nPlease visit the project's web site and follow\nthe instructions there."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer104->Add(itemStaticText107, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText106 = new wxStaticText; + itemStaticText106->Create( itemWizardPage102, wxID_STATIC, _("An account with that email address already exists\nand has a different password than the one you entered.\nPlease visit the project's web site and follow\nthe instructions there."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer103->Add(itemStaticText106, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountAlreadyExistsPage content construction } @@ -3951,96 +3267,63 @@ wxIcon CErrAccountAlreadyExistsPage::GetIconResource( const wxString& name ) /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRACCOUNTALREADYEXISTSPAGE - */ - void CErrAccountAlreadyExistsPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRACCOUNTALREADYEXISTSPAGE - */ - void CErrAccountAlreadyExistsPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! - * CErrAccountCreationDisabledPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrAccountCreationDisabledPage, wxWizardPage ) - /*! - * CErrAccountCreationDisabledPage event table definition - */ - BEGIN_EVENT_TABLE( CErrAccountCreationDisabledPage, wxWizardPage ) - ////@begin CErrAccountCreationDisabledPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CErrAccountCreationDisabledPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CErrAccountCreationDisabledPage::OnCancel ) ////@end CErrAccountCreationDisabledPage event table entries - END_EVENT_TABLE() /*! - * CErrAccountCreationDisabledPage constructors - */ - CErrAccountCreationDisabledPage::CErrAccountCreationDisabledPage( ) - { - } - CErrAccountCreationDisabledPage::CErrAccountCreationDisabledPage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CErrAccountCreationDisabledPage creator - */ - bool CErrAccountCreationDisabledPage::Create( wxWizard* parent ) - { - ////@begin CErrAccountCreationDisabledPage member initialisation ////@end CErrAccountCreationDisabledPage member initialisation @@ -4054,69 +3337,51 @@ bool CErrAccountCreationDisabledPage::Create( wxWizard* parent ) ////@end CErrAccountCreationDisabledPage creation return TRUE; - } /*! - * Control creation for CErrAccountCreationDisabledPage - */ - void CErrAccountCreationDisabledPage::CreateControls() - { ////@begin CErrAccountCreationDisabledPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrAccountCreationDisabledPage* itemWizardPage107 = this; - CErrAccountCreationDisabledPage* itemWizardPage108 = this; + wxBoxSizer* itemBoxSizer108 = new wxBoxSizer(wxVERTICAL); + itemWizardPage107->SetSizer(itemBoxSizer108); - wxBoxSizer* itemBoxSizer109 = new wxBoxSizer(wxVERTICAL); - itemWizardPage108->SetSizer(itemBoxSizer109); + wxStaticText* itemStaticText109 = new wxStaticText; + itemStaticText109->Create( itemWizardPage107, wxID_STATIC, _("Account creation disabled"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText109->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer108->Add(itemStaticText109, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText110 = new wxStaticText; - itemStaticText110->Create( itemWizardPage108, wxID_STATIC, _("Account creation disabled"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText110->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer109->Add(itemStaticText110, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer108->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer109->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText112 = new wxStaticText; - itemStaticText112->Create( itemWizardPage108, wxID_STATIC, _("This project is not accepting new accounts at this time."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer109->Add(itemStaticText112, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText111 = new wxStaticText; + itemStaticText111->Create( itemWizardPage107, wxID_STATIC, _("This project is not accepting new accounts at this time."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer108->Add(itemStaticText111, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountCreationDisabledPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CErrAccountCreationDisabledPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } - /*! - * Gets the next page. - */ - wxWizardPage* CErrAccountCreationDisabledPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -4124,157 +3389,104 @@ wxWizardPage* CErrAccountCreationDisabledPage::GetNext() const } return NULL; - } /*! - * Should we show tooltips? - */ - bool CErrAccountCreationDisabledPage::ShowToolTips() - { - return TRUE; - } - /*! - * Get bitmap resources - */ - wxBitmap CErrAccountCreationDisabledPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrAccountCreationDisabledPage bitmap retrieval return wxNullBitmap; ////@end CErrAccountCreationDisabledPage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CErrAccountCreationDisabledPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CErrAccountCreationDisabledPage icon retrieval return wxNullIcon; ////@end CErrAccountCreationDisabledPage icon retrieval - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRACCOUNTCREATIONDISABLEDPAGE - */ - void CErrAccountCreationDisabledPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRACCOUNTCREATIONDISABLEDPAGE - */ - void CErrAccountCreationDisabledPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! - * CErrProxyInfoPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrProxyInfoPage, wxWizardPage ) /*! - * CErrProxyInfoPage event table definition - */ - BEGIN_EVENT_TABLE( CErrProxyInfoPage, wxWizardPage ) - ////@begin CErrProxyInfoPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CErrProxyInfoPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CErrProxyInfoPage::OnCancel ) ////@end CErrProxyInfoPage event table entries - END_EVENT_TABLE() - /*! - * CErrProxyInfoPage constructors - */ - CErrProxyInfoPage::CErrProxyInfoPage( ) - { - } - CErrProxyInfoPage::CErrProxyInfoPage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CErrProxyInfoPage creator - */ - bool CErrProxyInfoPage::Create( wxWizard* parent ) - { - ////@begin CErrProxyInfoPage member initialisation ////@end CErrProxyInfoPage member initialisation @@ -4288,69 +3500,51 @@ bool CErrProxyInfoPage::Create( wxWizard* parent ) ////@end CErrProxyInfoPage creation return TRUE; - } /*! - * Control creation for CErrProxyInfoPage - */ - void CErrProxyInfoPage::CreateControls() - { - ////@begin CErrProxyInfoPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrProxyInfoPage* itemWizardPage112 = this; - CErrProxyInfoPage* itemWizardPage113 = this; + wxBoxSizer* itemBoxSizer113 = new wxBoxSizer(wxVERTICAL); + itemWizardPage112->SetSizer(itemBoxSizer113); - wxBoxSizer* itemBoxSizer114 = new wxBoxSizer(wxVERTICAL); - itemWizardPage113->SetSizer(itemBoxSizer114); + wxStaticText* itemStaticText114 = new wxStaticText; + itemStaticText114->Create( itemWizardPage112, wxID_STATIC, _("Network communication failed"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText114->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer113->Add(itemStaticText114, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText115 = new wxStaticText; - itemStaticText115->Create( itemWizardPage113, wxID_STATIC, _("Network communication failed"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText115->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer114->Add(itemStaticText115, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText115->Create( itemWizardPage112, wxID_STATIC, _("We were unable to communicate with the project\nor other web sites.\nOften this means that you are using a proxy server,\nand you need to tell us about it.\n\nClick Next to do proxy configuration."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer113->Add(itemStaticText115, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText116 = new wxStaticText; - itemStaticText116->Create( itemWizardPage113, wxID_STATIC, _("We were unable to communicate with the project\nor other web sites.\nOften this means that you are using a proxy server,\nand you need to tell us about it.\n\nClick Next to do proxy configuration."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer114->Add(itemStaticText116, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer114->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer113->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyInfoPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CErrProxyInfoPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } /*! - * Gets the next page. - */ - wxWizardPage* CErrProxyInfoPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -4360,113 +3554,76 @@ wxWizardPage* CErrProxyInfoPage::GetNext() const return PAGE_TRANSITION_NEXT(ID_ERRPROXYHTTPPAGE); } return NULL; - } /*! - * Should we show tooltips? - */ - bool CErrProxyInfoPage::ShowToolTips() - { - return TRUE; - } - /*! - * Get bitmap resources - */ - wxBitmap CErrProxyInfoPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrProxyInfoPage bitmap retrieval return wxNullBitmap; ////@end CErrProxyInfoPage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CErrProxyInfoPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CErrProxyInfoPage icon retrieval return wxNullIcon; ////@end CErrProxyInfoPage icon retrieval - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRPROXYINFOPAGE - */ - void CErrProxyInfoPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRPROXYINFOPAGE - */ - void CErrProxyInfoPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } /*! - * CErrProxyHTTPPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrProxyHTTPPage, wxWizardPage ) - /*! - * CErrProxyHTTPPage event table definition - */ - BEGIN_EVENT_TABLE( CErrProxyHTTPPage, wxWizardPage ) - ////@begin CErrProxyHTTPPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CErrProxyHTTPPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CErrProxyHTTPPage::OnCancel ) @@ -4475,42 +3632,27 @@ BEGIN_EVENT_TABLE( CErrProxyHTTPPage, wxWizardPage ) ////@end CErrProxyHTTPPage event table entries - END_EVENT_TABLE() - /*! - * CErrProxyHTTPPage constructors - */ - CErrProxyHTTPPage::CErrProxyHTTPPage( ) - { - } - CErrProxyHTTPPage::CErrProxyHTTPPage( wxWizard* parent ) - { - Create( parent ); - } /*! - * CErrProxyHTTPPage creator - */ - bool CErrProxyHTTPPage::Create( wxWizard* parent ) - { ////@begin CErrProxyHTTPPage member initialisation @@ -4534,85 +3676,75 @@ bool CErrProxyHTTPPage::Create( wxWizard* parent ) ////@end CErrProxyHTTPPage creation return TRUE; - } /*! - * Control creation for CErrProxyHTTPPage - */ - void CErrProxyHTTPPage::CreateControls() - { - ////@begin CErrProxyHTTPPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrProxyHTTPPage* itemWizardPage117 = this; - CErrProxyHTTPPage* itemWizardPage118 = this; + wxBoxSizer* itemBoxSizer118 = new wxBoxSizer(wxVERTICAL); + itemWizardPage117->SetSizer(itemBoxSizer118); - wxBoxSizer* itemBoxSizer119 = new wxBoxSizer(wxVERTICAL); - itemWizardPage118->SetSizer(itemBoxSizer119); + wxStaticText* itemStaticText119 = new wxStaticText; + itemStaticText119->Create( itemWizardPage117, wxID_STATIC, _("HTTP proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText119->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer118->Add(itemStaticText119, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText120 = new wxStaticText; - itemStaticText120->Create( itemWizardPage118, wxID_STATIC, _("HTTP proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText120->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer119->Add(itemStaticText120, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText120->Create( itemWizardPage117, wxID_STATIC, _("If you're using an HTTP proxy, enter its info here.\nIf you're not sure, click Autodetect."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer118->Add(itemStaticText120, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText121 = new wxStaticText; - itemStaticText121->Create( itemWizardPage118, wxID_STATIC, _("If you're using an HTTP proxy, enter its info here.\nIf you're not sure, click Autodetect."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer119->Add(itemStaticText121, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer118->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer119->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxButton* itemButton122 = new wxButton; + itemButton122->Create( itemWizardPage117, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer118->Add(itemButton122, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - itemBoxSizer119->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxButton* itemButton124 = new wxButton; - itemButton124->Create( itemWizardPage118, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer119->Add(itemButton124, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxFlexGridSizer* itemFlexGridSizer125 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer125->AddGrowableCol(1); - itemBoxSizer119->Add(itemFlexGridSizer125, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer123 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer123->AddGrowableCol(1); + itemBoxSizer118->Add(itemFlexGridSizer123, 0, wxGROW|wxALL, 5); m_ProxyHTTPServerStaticCtrl = new wxStaticText; - m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage117, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer123->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer127 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer127->AddGrowableCol(0); - itemFlexGridSizer125->Add(itemFlexGridSizer127, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer125 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer125->AddGrowableCol(0); + itemFlexGridSizer123->Add(itemFlexGridSizer125, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxyHTTPServerCtrl = new wxTextCtrl; - m_ProxyHTTPServerCtrl->Create( itemWizardPage118, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer127->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerCtrl->Create( itemWizardPage117, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer125->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortStaticCtrl = new wxStaticText; - m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer127->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage117, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer125->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortCtrl = new wxTextCtrl; - m_ProxyHTTPPortCtrl->Create( itemWizardPage118, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer127->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortCtrl->Create( itemWizardPage117, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer125->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameStaticCtrl = new wxStaticText; - m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage117, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer123->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameCtrl = new wxTextCtrl; - m_ProxyHTTPUsernameCtrl->Create( itemWizardPage118, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameCtrl->Create( itemWizardPage117, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer123->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordStaticCtrl = new wxStaticText; - m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage117, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer123->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordCtrl = new wxTextCtrl; - m_ProxyHTTPPasswordCtrl->Create( itemWizardPage118, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer125->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordCtrl->Create( itemWizardPage117, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer123->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxyHTTPServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxyHTTPServer) ); @@ -4620,34 +3752,22 @@ void CErrProxyHTTPPage::CreateControls() m_ProxyHTTPUsernameCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxyHTTPUsername) ); m_ProxyHTTPPasswordCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxyHTTPPassword) ); ////@end CErrProxyHTTPPage content construction - } - /*! - * Gets the previous page. - */ - wxWizardPage* CErrProxyHTTPPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } - /*! - * Gets the next page. - */ - wxWizardPage* CErrProxyHTTPPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -4657,129 +3777,81 @@ wxWizardPage* CErrProxyHTTPPage::GetNext() const return PAGE_TRANSITION_NEXT(ID_ERRPROXYSOCKSPAGE); } return NULL; - } - /*! - * Should we show tooltips? - */ - bool CErrProxyHTTPPage::ShowToolTips() - { - return TRUE; - } - /*! - * Get bitmap resources - */ - wxBitmap CErrProxyHTTPPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrProxyHTTPPage bitmap retrieval return wxNullBitmap; ////@end CErrProxyHTTPPage bitmap retrieval - } - /*! - * Get icon resources - */ - wxIcon CErrProxyHTTPPage::GetIconResource( const wxString& name ) - { - // Icon retrieval - ////@begin CErrProxyHTTPPage icon retrieval return wxNullIcon; ////@end CErrProxyHTTPPage icon retrieval - } - /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_HTTPAUTODETECT - */ - void CErrProxyHTTPPage::OnAutodetectClick( wxCommandEvent& event ) - { - event.Skip(); - } /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRPROXYHTTPPAGE - */ - void CErrProxyHTTPPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRPROXYHTTPPAGE - */ - void CErrProxyHTTPPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } - /*! - * CErrProxySOCKSPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrProxySOCKSPage, wxWizardPage ) - /*! - * CErrProxySOCKSPage event table definition - */ - BEGIN_EVENT_TABLE( CErrProxySOCKSPage, wxWizardPage ) - ////@begin CErrProxySOCKSPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CErrProxySOCKSPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CErrProxySOCKSPage::OnCancel ) @@ -4788,44 +3860,27 @@ BEGIN_EVENT_TABLE( CErrProxySOCKSPage, wxWizardPage ) ////@end CErrProxySOCKSPage event table entries - END_EVENT_TABLE() - /*! - * CErrProxySOCKSPage constructors - */ - CErrProxySOCKSPage::CErrProxySOCKSPage( ) - { - } - CErrProxySOCKSPage::CErrProxySOCKSPage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CErrProxyInfoPage creator - */ - bool CErrProxySOCKSPage::Create( wxWizard* parent ) - { - ////@begin CErrProxySOCKSPage member initialisation m_ProxySOCKSServerStaticCtrl = NULL; m_ProxySOCKSServerCtrl = NULL; @@ -4847,85 +3902,74 @@ bool CErrProxySOCKSPage::Create( wxWizard* parent ) ////@end CErrProxySOCKSPage creation return TRUE; - } - /*! - * Control creation for CErrProxyInfoPage - */ - void CErrProxySOCKSPage::CreateControls() - { - ////@begin CErrProxySOCKSPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrProxySOCKSPage* itemWizardPage133 = this; - CErrProxySOCKSPage* itemWizardPage135 = this; + wxBoxSizer* itemBoxSizer134 = new wxBoxSizer(wxVERTICAL); + itemWizardPage133->SetSizer(itemBoxSizer134); - wxBoxSizer* itemBoxSizer136 = new wxBoxSizer(wxVERTICAL); - itemWizardPage135->SetSizer(itemBoxSizer136); + wxStaticText* itemStaticText135 = new wxStaticText; + itemStaticText135->Create( itemWizardPage133, wxID_STATIC, _("SOCKS proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText135->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer134->Add(itemStaticText135, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText137 = new wxStaticText; - itemStaticText137->Create( itemWizardPage135, wxID_STATIC, _("SOCKS proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText137->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer136->Add(itemStaticText137, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText136 = new wxStaticText; + itemStaticText136->Create( itemWizardPage133, wxID_STATIC, _("If you're using a SOCKS proxy, enter its info here.\nIf you're not sure, click Autodetect.\n"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer134->Add(itemStaticText136, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText138 = new wxStaticText; - itemStaticText138->Create( itemWizardPage135, wxID_STATIC, _("If you're using a SOCKS proxy, enter its info here.\nIf you're not sure, click Autodetect.\n"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer136->Add(itemStaticText138, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer134->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer136->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxButton* itemButton138 = new wxButton; + itemButton138->Create( itemWizardPage133, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer134->Add(itemButton138, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - itemBoxSizer136->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxButton* itemButton141 = new wxButton; - itemButton141->Create( itemWizardPage135, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer136->Add(itemButton141, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxFlexGridSizer* itemFlexGridSizer142 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer142->AddGrowableCol(1); - itemBoxSizer136->Add(itemFlexGridSizer142, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer139 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer139->AddGrowableCol(1); + itemBoxSizer134->Add(itemFlexGridSizer139, 0, wxGROW|wxALL, 5); m_ProxySOCKSServerStaticCtrl = new wxStaticText; - m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage133, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer139->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer144 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer144->AddGrowableCol(0); - itemFlexGridSizer142->Add(itemFlexGridSizer144, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer141 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer141->AddGrowableCol(0); + itemFlexGridSizer139->Add(itemFlexGridSizer141, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxySOCKSServerCtrl = new wxTextCtrl; - m_ProxySOCKSServerCtrl->Create( itemWizardPage135, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer144->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerCtrl->Create( itemWizardPage133, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer141->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortStaticCtrl = new wxStaticText; - m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer144->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage133, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer141->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortCtrl = new wxTextCtrl; - m_ProxySOCKSPortCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer144->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortCtrl->Create( itemWizardPage133, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer141->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameStaticCtrl = new wxStaticText; - m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage133, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer139->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameCtrl = new wxTextCtrl; - m_ProxySOCKSUsernameCtrl->Create( itemWizardPage135, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameCtrl->Create( itemWizardPage133, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer139->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordStaticCtrl = new wxStaticText; - m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage133, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer139->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordCtrl = new wxTextCtrl; - m_ProxySOCKSPasswordCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer142->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordCtrl->Create( itemWizardPage133, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer139->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxySOCKSServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxySOCKSServer) ); @@ -4933,34 +3977,23 @@ void CErrProxySOCKSPage::CreateControls() m_ProxySOCKSUsernameCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxySOCKSUsername) ); m_ProxySOCKSPasswordCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxySOCKSPassword) ); ////@end CErrProxySOCKSPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CErrProxySOCKSPage::GetPrev() const - { return PAGE_TRANSITION_BACK; - } - /*! - * Gets the next page. - */ - wxWizardPage* CErrProxySOCKSPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -4970,177 +4003,111 @@ wxWizardPage* CErrProxySOCKSPage::GetNext() const return PAGE_TRANSITION_NEXT(ID_ERRPROXYCOMPLETIONPAGE); } return NULL; - } - /*! - * Should we show tooltips? - */ - bool CErrProxySOCKSPage::ShowToolTips() - { - return TRUE; - } - /*! - * Get bitmap resources - */ - wxBitmap CErrProxySOCKSPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrProxySOCKSPage bitmap retrieval return wxNullBitmap; ////@end CErrProxySOCKSPage bitmap retrieval - } - /*! - * Get icon resources - */ - wxIcon CErrProxySOCKSPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CErrProxySOCKSPage icon retrieval return wxNullIcon; ////@end CErrProxySOCKSPage icon retrieval - } /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SOCKSAUTODETECT - */ - void CErrProxySOCKSPage::OnAutodetectClick( wxCommandEvent& event ) - { - event.Skip(); - } - /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRPROXYSOCKSPAGE - */ - void CErrProxySOCKSPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } - /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRPROXYSOCKSPAGE - */ - void CErrProxySOCKSPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } - /*! - * CErrProxyComplationPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrProxyComplationPage, wxWizardPage ) - /*! - * CErrProxyComplationPage event table definition - */ - BEGIN_EVENT_TABLE( CErrProxyComplationPage, wxWizardPage ) - ////@begin CErrProxyComplationPage event table entries EVT_WIZARD_PAGE_CHANGED( -1, CErrProxyComplationPage::OnPageChanged ) EVT_WIZARD_CANCEL( -1, CErrProxyComplationPage::OnCancel ) ////@end CErrProxyComplationPage event table entries - END_EVENT_TABLE() - /*! - * CErrProxyComplationPage constructors - */ - CErrProxyComplationPage::CErrProxyComplationPage( ) - { - } - CErrProxyComplationPage::CErrProxyComplationPage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CErrProxyComplationPage creator - */ - bool CErrProxyComplationPage::Create( wxWizard* parent ) - { - ////@begin CErrProxyComplationPage member initialisation ////@end CErrProxyComplationPage member initialisation - ////@begin CErrProxyComplationPage creation wxBitmap wizardBitmap(wxNullBitmap); wxWizardPage::Create( parent, wizardBitmap ); @@ -5150,54 +4117,40 @@ bool CErrProxyComplationPage::Create( wxWizard* parent ) ////@end CErrProxyComplationPage creation return TRUE; - } - /*! - * Control creation for CErrProxyComplationPage - */ - void CErrProxyComplationPage::CreateControls() - { - ////@begin CErrProxyComplationPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrProxyComplationPage* itemWizardPage149 = this; - CErrProxyComplationPage* itemWizardPage152 = this; + wxBoxSizer* itemBoxSizer150 = new wxBoxSizer(wxVERTICAL); + itemWizardPage149->SetSizer(itemBoxSizer150); - wxBoxSizer* itemBoxSizer153 = new wxBoxSizer(wxVERTICAL); - itemWizardPage152->SetSizer(itemBoxSizer153); + wxStaticText* itemStaticText151 = new wxStaticText; + itemStaticText151->Create( itemWizardPage149, wxID_STATIC, _("Proxy configuration complete"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText151->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer150->Add(itemStaticText151, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText154 = new wxStaticText; - itemStaticText154->Create( itemWizardPage152, wxID_STATIC, _("Proxy configuration complete"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText154->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer153->Add(itemStaticText154, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText152 = new wxStaticText; + itemStaticText152->Create( itemWizardPage149, wxID_STATIC, _("Click Next to continue."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer150->Add(itemStaticText152, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText155 = new wxStaticText; - itemStaticText155->Create( itemWizardPage152, wxID_STATIC, _("Click Next to continue."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer153->Add(itemStaticText155, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer153->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer150->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyComplationPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CErrProxyComplationPage::GetPrev() const - { return PAGE_TRANSITION_BACK; @@ -5205,14 +4158,10 @@ wxWizardPage* CErrProxyComplationPage::GetPrev() const /*! - * Gets the next page. - */ - wxWizardPage* CErrProxyComplationPage::GetNext() const - { if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) { // Cancel Event Detected @@ -5222,154 +4171,97 @@ wxWizardPage* CErrProxyComplationPage::GetNext() const return PAGE_TRANSITION_NEXT(ID_PROJECTPROPERTIESPAGE); } return NULL; - } - /*! - * Should we show tooltips? - */ - bool CErrProxyComplationPage::ShowToolTips() - { - return TRUE; - } - /*! - * Get bitmap resources - */ - wxBitmap CErrProxyComplationPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrProxyComplationPage bitmap retrieval return wxNullBitmap; ////@end CErrProxyComplationPage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CErrProxyComplationPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CErrProxyComplationPage icon retrieval return wxNullIcon; ////@end CErrProxyComplationPage icon retrieval - } - /*! - * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRPROXYCOMPLETIONPAGE - */ - void CErrProxyComplationPage::OnPageChanged( wxWizardEvent& event ) { - event.Skip(); - } - /*! - * wxEVT_WIZARD_CANCEL event handler for ID_ERRPROXYCOMPLETIONPAGE - */ - void CErrProxyComplationPage::OnCancel( wxWizardEvent& event ) { ((CWizAttachProject*)GetParent())->ProcessCancelEvent(event); - } - /*! - * CErrRefCountPage type definition - */ - IMPLEMENT_DYNAMIC_CLASS( CErrRefCountPage, wxWizardPage ) - /*! - * CErrRefCountPage event table definition - */ - BEGIN_EVENT_TABLE( CErrRefCountPage, wxWizardPage ) - ////@begin CErrRefCountPage event table entries ////@end CErrRefCountPage event table entries - END_EVENT_TABLE() /*! - * CErrRefCountPage constructors - */ - CErrRefCountPage::CErrRefCountPage( ) - { - } - CErrRefCountPage::CErrRefCountPage( wxWizard* parent ) - { - Create( parent ); - } - /*! - * CErrRefCountPage creator - */ - bool CErrRefCountPage::Create( wxWizard* parent ) - { - ////@begin CErrRefCountPage member initialisation ////@end CErrRefCountPage member initialisation @@ -5383,141 +4275,106 @@ bool CErrRefCountPage::Create( wxWizard* parent ) ////@end CErrRefCountPage creation return TRUE; - } /*! - * Control creation for CErrRefCountPage - */ - void CErrRefCountPage::CreateControls() - { - ////@begin CErrRefCountPage content construction - // Generated by DialogBlocks, 08/12/05 16:58:34 (unregistered) + CErrRefCountPage* itemWizardPage154 = this; - CErrRefCountPage* itemWizardPage157 = this; + wxBoxSizer* itemBoxSizer155 = new wxBoxSizer(wxVERTICAL); + itemWizardPage154->SetSizer(itemBoxSizer155); - wxBoxSizer* itemBoxSizer158 = new wxBoxSizer(wxVERTICAL); - itemWizardPage157->SetSizer(itemBoxSizer158); + wxStaticText* itemStaticText156 = new wxStaticText; + itemStaticText156->Create( itemWizardPage154, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText156->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer155->Add(itemStaticText156, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText157 = new wxStaticText; + itemStaticText157->Create( itemWizardPage154, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer155->Add(itemStaticText157, 0, wxALIGN_LEFT|wxALL, 5); + + itemBoxSizer155->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText159 = new wxStaticText; - itemStaticText159->Create( itemWizardPage157, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText159->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer158->Add(itemStaticText159, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText159->Create( itemWizardPage154, wxID_STATIC, _("This page just increases the refcount of various bitmap resources\n\nso that DialogBlocks doesn't nuke the refences to them."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer155->Add(itemStaticText159, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText160 = new wxStaticText; - itemStaticText160->Create( itemWizardPage157, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer158->Add(itemStaticText160, 0, wxALIGN_LEFT|wxALL, 5); + wxBoxSizer* itemBoxSizer160 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer155->Add(itemBoxSizer160, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer158->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxBitmap itemStaticBitmap161Bitmap(itemWizardPage154->GetBitmapResource(wxT("res/wizprogress1.xpm"))); + wxStaticBitmap* itemStaticBitmap161 = new wxStaticBitmap; + itemStaticBitmap161->Create( itemWizardPage154, wxID_STATIC, itemStaticBitmap161Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer160->Add(itemStaticBitmap161, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText162 = new wxStaticText; - itemStaticText162->Create( itemWizardPage157, wxID_STATIC, _("This page just increases the refcount of various bitmap resources\n\nso that DialogBlocks doesn't nuke the refences to them."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer158->Add(itemStaticText162, 0, wxALIGN_LEFT|wxALL, 5); + wxBitmap itemStaticBitmap162Bitmap(itemWizardPage154->GetBitmapResource(wxT("res/wizprogress2.xpm"))); + wxStaticBitmap* itemStaticBitmap162 = new wxStaticBitmap; + itemStaticBitmap162->Create( itemWizardPage154, wxID_STATIC, itemStaticBitmap162Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer160->Add(itemStaticBitmap162, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer163 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer158->Add(itemBoxSizer163, 0, wxALIGN_LEFT|wxALL, 5); + wxBitmap itemStaticBitmap163Bitmap(itemWizardPage154->GetBitmapResource(wxT("res/wizprogress3.xpm"))); + wxStaticBitmap* itemStaticBitmap163 = new wxStaticBitmap; + itemStaticBitmap163->Create( itemWizardPage154, wxID_STATIC, itemStaticBitmap163Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer160->Add(itemStaticBitmap163, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap164Bitmap(itemWizardPage157->GetBitmapResource(wxT("res/wizprogress1.xpm"))); + wxBitmap itemStaticBitmap164Bitmap(itemWizardPage154->GetBitmapResource(wxT("res/wizprogress4.xpm"))); wxStaticBitmap* itemStaticBitmap164 = new wxStaticBitmap; - itemStaticBitmap164->Create( itemWizardPage157, wxID_STATIC, itemStaticBitmap164Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer163->Add(itemStaticBitmap164, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap164->Create( itemWizardPage154, wxID_STATIC, itemStaticBitmap164Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer160->Add(itemStaticBitmap164, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap165Bitmap(itemWizardPage157->GetBitmapResource(wxT("res/wizprogress2.xpm"))); + wxBitmap itemStaticBitmap165Bitmap(itemWizardPage154->GetBitmapResource(wxT("res/wizfailure.xpm"))); wxStaticBitmap* itemStaticBitmap165 = new wxStaticBitmap; - itemStaticBitmap165->Create( itemWizardPage157, wxID_STATIC, itemStaticBitmap165Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer163->Add(itemStaticBitmap165, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap165->Create( itemWizardPage154, wxID_STATIC, itemStaticBitmap165Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer160->Add(itemStaticBitmap165, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap166Bitmap(itemWizardPage157->GetBitmapResource(wxT("res/wizprogress3.xpm"))); + wxBitmap itemStaticBitmap166Bitmap(itemWizardPage154->GetBitmapResource(wxT("res/wizsuccess.xpm"))); wxStaticBitmap* itemStaticBitmap166 = new wxStaticBitmap; - itemStaticBitmap166->Create( itemWizardPage157, wxID_STATIC, itemStaticBitmap166Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer163->Add(itemStaticBitmap166, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBitmap itemStaticBitmap167Bitmap(itemWizardPage157->GetBitmapResource(wxT("res/wizprogress4.xpm"))); - wxStaticBitmap* itemStaticBitmap167 = new wxStaticBitmap; - itemStaticBitmap167->Create( itemWizardPage157, wxID_STATIC, itemStaticBitmap167Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer163->Add(itemStaticBitmap167, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBitmap itemStaticBitmap168Bitmap(itemWizardPage157->GetBitmapResource(wxT("res/wizfailure.xpm"))); - wxStaticBitmap* itemStaticBitmap168 = new wxStaticBitmap; - itemStaticBitmap168->Create( itemWizardPage157, wxID_STATIC, itemStaticBitmap168Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer163->Add(itemStaticBitmap168, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBitmap itemStaticBitmap169Bitmap(itemWizardPage157->GetBitmapResource(wxT("res/wizsuccess.xpm"))); - wxStaticBitmap* itemStaticBitmap169 = new wxStaticBitmap; - itemStaticBitmap169->Create( itemWizardPage157, wxID_STATIC, itemStaticBitmap169Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer163->Add(itemStaticBitmap169, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap166->Create( itemWizardPage154, wxID_STATIC, itemStaticBitmap166Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer160->Add(itemStaticBitmap166, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); ////@end CErrRefCountPage content construction - } /*! - * Gets the previous page. - */ - wxWizardPage* CErrRefCountPage::GetPrev() const - { - return NULL; - } - /*! - * Gets the next page. - */ - wxWizardPage* CErrRefCountPage::GetNext() const - { - return NULL; - } - /*! - * Should we show tooltips? - */ - bool CErrRefCountPage::ShowToolTips() - { - return TRUE; - } - /*! - * Get bitmap resources - */ - wxBitmap CErrRefCountPage::GetBitmapResource( const wxString& name ) - { - // Bitmap retrieval ////@begin CErrRefCountPage bitmap retrieval @@ -5553,25 +4410,18 @@ wxBitmap CErrRefCountPage::GetBitmapResource( const wxString& name ) } return wxNullBitmap; ////@end CErrRefCountPage bitmap retrieval - } /*! - * Get icon resources - */ - wxIcon CErrRefCountPage::GetIconResource( const wxString& name ) - { - // Icon retrieval ////@begin CErrRefCountPage icon retrieval return wxNullIcon; ////@end CErrRefCountPage icon retrieval - } diff --git a/lib/boinc_win.h b/lib/boinc_win.h index 89fbb27a26..31954fb4c2 100644 --- a/lib/boinc_win.h +++ b/lib/boinc_win.h @@ -137,6 +137,7 @@ #define read _read #define stat _stat #define finite _finite +#define chdir _chdir // On the Win32 platform include file and line number information for each diff --git a/win_build/boinc.sln b/win_build/boinc.sln index 8a44f26f45..4c01f58e2d 100644 --- a/win_build/boinc.sln +++ b/win_build/boinc.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "boinc_cli.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "boinc_cli_curl.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}" ProjectSection(ProjectDependencies) = postProject {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} {0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E} @@ -39,8 +39,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cmd", "boinccmd.vcpro {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "boincmgr.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "boincmgr_curl.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}" ProjectSection(ProjectDependencies) = postProject + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} EndProjectSection EndProject Global diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj index 5417481571..7cd9ae63e9 100644 --- a/win_build/boinc_cli_curl.vcproj +++ b/win_build/boinc_cli_curl.vcproj @@ -22,7 +22,7 @@ + + Compiler: Microsoft Visual C++ Toolkit 2003 + Library: Microsoft Visual C++ 6.0 (to link with MSVCRT.DLL) + + +Copyright notice +================ + (C) 1995-2005 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + diff --git a/zlib/include/zconf.h b/zlib/include/zconf.h new file mode 100644 index 0000000000..03a9431c8b --- /dev/null +++ b/zlib/include/zconf.h @@ -0,0 +1,332 @@ +/* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#ifndef ZCONF_H +#define ZCONF_H + +/* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + */ +#ifdef Z_PREFIX +# define deflateInit_ z_deflateInit_ +# define deflate z_deflate +# define deflateEnd z_deflateEnd +# define inflateInit_ z_inflateInit_ +# define inflate z_inflate +# define inflateEnd z_inflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateSetDictionary z_deflateSetDictionary +# define deflateCopy z_deflateCopy +# define deflateReset z_deflateReset +# define deflateParams z_deflateParams +# define deflateBound z_deflateBound +# define deflatePrime z_deflatePrime +# define inflateInit2_ z_inflateInit2_ +# define inflateSetDictionary z_inflateSetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateCopy z_inflateCopy +# define inflateReset z_inflateReset +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# define uncompress z_uncompress +# define adler32 z_adler32 +# define crc32 z_crc32 +# define get_crc_table z_get_crc_table +# define zError z_zError + +# define alloc_func z_alloc_func +# define free_func z_free_func +# define in_func z_in_func +# define out_func z_out_func +# define Byte z_Byte +# define uInt z_uInt +# define uLong z_uLong +# define Bytef z_Bytef +# define charf z_charf +# define intf z_intf +# define uIntf z_uIntf +# define uLongf z_uLongf +# define voidpf z_voidpf +# define voidp z_voidp +#endif + +#if defined(__MSDOS__) && !defined(MSDOS) +# define MSDOS +#endif +#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +# define OS2 +#endif +#if defined(_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif +#endif +#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +# ifndef SYS16BIT +# define SYS16BIT +# endif +# endif +#endif + +/* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ +#ifdef SYS16BIT +# define MAXSEG_64K +#endif +#ifdef MSDOS +# define UNALIGNED_OK +#endif + +#ifdef __STDC_VERSION__ +# ifndef STDC +# define STDC +# endif +# if __STDC_VERSION__ >= 199901L +# ifndef STDC99 +# define STDC99 +# endif +# endif +#endif +#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +# define STDC +#endif +#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +# define STDC +#endif +#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +# define STDC +#endif +#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +# define STDC +#endif + +#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +# define STDC +#endif + +#ifndef STDC +# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +# define const /* note: need a more gentle solution here */ +# endif +#endif + +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL +#endif + +/* Maximum value for memLevel in deflateInit2 */ +#ifndef MAX_MEM_LEVEL +# ifdef MAXSEG_64K +# define MAX_MEM_LEVEL 8 +# else +# define MAX_MEM_LEVEL 9 +# endif +#endif + +/* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ +#ifndef MAX_WBITS +# define MAX_WBITS 15 /* 32K LZ77 window */ +#endif + +/* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. +*/ + + /* Type declarations */ + +#ifndef OF /* function prototypes */ +# ifdef STDC +# define OF(args) args +# else +# define OF(args) () +# endif +#endif + +/* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + +#if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ +# ifdef ZLIB_DLL +# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# ifdef ZLIB_INTERNAL +# define ZEXTERN extern __declspec(dllexport) +# else +# define ZEXTERN extern __declspec(dllimport) +# endif +# endif +# endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ +# ifdef ZLIB_WINAPI +# ifdef FAR +# undef FAR +# endif +# include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR CDECL +# endif +# endif +#endif + +#if defined (__BEOS__) +# ifdef ZLIB_DLL +# ifdef ZLIB_INTERNAL +# define ZEXPORT __declspec(dllexport) +# define ZEXPORTVA __declspec(dllexport) +# else +# define ZEXPORT __declspec(dllimport) +# define ZEXPORTVA __declspec(dllimport) +# endif +# endif +#endif + +#ifndef ZEXTERN +# define ZEXTERN extern +#endif +#ifndef ZEXPORT +# define ZEXPORT +#endif +#ifndef ZEXPORTVA +# define ZEXPORTVA +#endif + +#ifndef FAR +# define FAR +#endif + +#if !defined(__MACTYPES__) +typedef unsigned char Byte; /* 8 bits */ +#endif +typedef unsigned int uInt; /* 16 bits or more */ +typedef unsigned long uLong; /* 32 bits or more */ + +#ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +# define Bytef Byte FAR +#else + typedef Byte FAR Bytef; +#endif +typedef char FAR charf; +typedef int FAR intf; +typedef uInt FAR uIntf; +typedef uLong FAR uLongf; + +#ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; +#else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; +#endif + +#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +# include /* for off_t */ +# include /* for SEEK_* and off_t */ +# ifdef VMS +# include /* for off_t */ +# endif +# define z_off_t off_t +#endif +#ifndef SEEK_SET +# define SEEK_SET 0 /* Seek from beginning of file. */ +# define SEEK_CUR 1 /* Seek from current position. */ +# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +#endif +#ifndef z_off_t +# define z_off_t long +#endif + +#if defined(__OS400__) +# define NO_vsnprintf +#endif + +#if defined(__MVS__) +# define NO_vsnprintf +# ifdef FAR +# undef FAR +# endif +#endif + +/* MVS linker does not support external names larger than 8 bytes */ +#if defined(__MVS__) +# pragma map(deflateInit_,"DEIN") +# pragma map(deflateInit2_,"DEIN2") +# pragma map(deflateEnd,"DEEND") +# pragma map(deflateBound,"DEBND") +# pragma map(inflateInit_,"ININ") +# pragma map(inflateInit2_,"ININ2") +# pragma map(inflateEnd,"INEND") +# pragma map(inflateSync,"INSY") +# pragma map(inflateSetDictionary,"INSEDI") +# pragma map(compressBound,"CMBND") +# pragma map(inflate_table,"INTABL") +# pragma map(inflate_fast,"INFA") +# pragma map(inflate_copyright,"INCOPY") +#endif + +#endif /* ZCONF_H */ diff --git a/zlib/include/zlib.h b/zlib/include/zlib.h new file mode 100644 index 0000000000..022817927c --- /dev/null +++ b/zlib/include/zlib.h @@ -0,0 +1,1357 @@ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.3, July 18th, 2005 + + Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt + (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). +*/ + +#ifndef ZLIB_H +#define ZLIB_H + +#include "zconf.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ZLIB_VERSION "1.2.3" +#define ZLIB_VERNUM 0x1230 + +/* + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed + data. This version of the library supports only one compression method + (deflation) but other algorithms will be added later and will have the same + stream interface. + + Compression can be done in a single step if the buffers are large + enough (for example if an input file is mmap'ed), or can be done by + repeated calls of the compression function. In the latter case, the + application must provide more input and/or consume the output + (providing more output space) before each call. + + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + + This library can optionally read and write gzip streams in memory as well. + + The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never + crash even in case of corrupted input. +*/ + +typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); +typedef void (*free_func) OF((voidpf opaque, voidpf address)); + +struct internal_state; + +typedef struct z_stream_s { + Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ + uLong total_in; /* total nb of input bytes read so far */ + + Bytef *next_out; /* next output byte should be put there */ + uInt avail_out; /* remaining free space at next_out */ + uLong total_out; /* total nb of bytes output so far */ + + char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ + free_func zfree; /* used to free the internal state */ + voidpf opaque; /* private data object passed to zalloc and zfree */ + + int data_type; /* best guess about the data type: binary or text */ + uLong adler; /* adler32 value of the uncompressed data */ + uLong reserved; /* reserved for future use */ +} z_stream; + +typedef z_stream FAR *z_streamp; + +/* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. +*/ +typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ +} gz_header; + +typedef gz_header FAR *gz_headerp; + +/* + The application must update next_in and avail_in when avail_in has + dropped to zero. It must update next_out and avail_out when avail_out + has dropped to zero. The application must initialize zalloc, zfree and + opaque before calling the init function. All other fields are set by the + compression library and must not be updated by the application. + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value. + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this + if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, + pointers returned by zalloc for objects of exactly 65536 bytes *must* + have their offset normalized to zero. The default allocation function + provided by this library ensures this (see zutil.c). To reduce memory + requirements and avoid any allocation of 64K objects, at the expense of + compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). + + The fields total_in and total_out can be used for statistics or + progress reports. After compression, total_in holds the total size of + the uncompressed data and may be saved for use in the decompressor + (particularly if the decompressor wants to decompress everything in + a single step). +*/ + + /* constants */ + +#define Z_NO_FLUSH 0 +#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ +#define Z_SYNC_FLUSH 2 +#define Z_FULL_FLUSH 3 +#define Z_FINISH 4 +#define Z_BLOCK 5 +/* Allowed flush values; see deflate() and inflate() below for details */ + +#define Z_OK 0 +#define Z_STREAM_END 1 +#define Z_NEED_DICT 2 +#define Z_ERRNO (-1) +#define Z_STREAM_ERROR (-2) +#define Z_DATA_ERROR (-3) +#define Z_MEM_ERROR (-4) +#define Z_BUF_ERROR (-5) +#define Z_VERSION_ERROR (-6) +/* Return codes for the compression/decompression functions. Negative + * values are errors, positive values are used for special but normal events. + */ + +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +/* compression strategy; see deflateInit2() below for details */ + +#define Z_BINARY 0 +#define Z_TEXT 1 +#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ +#define Z_UNKNOWN 2 +/* Possible values of the data_type field (though see inflate()) */ + +#define Z_DEFLATED 8 +/* The deflate compression method (the only one supported in this version) */ + +#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ + +#define zlib_version zlibVersion() +/* for compatibility with versions < 1.0.2 */ + + /* basic functions */ + +ZEXTERN const char * ZEXPORT zlibVersion OF((void)); +/* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is + not compatible with the zlib.h header file used by the application. + This check is automatically made by deflateInit and inflateInit. + */ + +/* +ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. + If zalloc and zfree are set to Z_NULL, deflateInit updates them to + use default allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at + all (the input data is simply copied a block at a time). + Z_DEFAULT_COMPRESSION requests a default compromise between speed and + compression (currently equivalent to level 6). + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if level is not a valid compression level, + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). + msg is set to null if there is no error message. deflateInit does not + perform any compression: this will be done by deflate(). +*/ + + +ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); +/* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce some + output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary (in interactive applications). + Some output may be provided even if flush is not set. + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating avail_in or avail_out accordingly; avail_out + should never be zero before the call. The application can consume the + compressed output when it wants, for example when the output buffer is full + (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK + and with zero avail_out, it must be called again after making room in the + output buffer because there might be more output pending. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumualte before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In particular + avail_in is zero after the call if enough output space has been provided + before the call.) Flushing may degrade compression for some compression + algorithms and so it should be used only when necessary. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there + was enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the + stream are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least + the value returned by deflateBound (see below). If deflate does not return + Z_STREAM_END, then it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). + + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect + the compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. +*/ + + +ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, + msg may be set but then points to a static string (which must not be + deallocated). +*/ + + +/* +ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. If next_in is not Z_NULL and avail_in is large enough (the exact + value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller. msg is set to null if there is no error + message. inflateInit does not perform any decompression apart from reading + the zlib header if present: this will be done by inflate(). (So next_in and + avail_in may be modified, but next_out and avail_out are unchanged.) +*/ + + +ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); +/* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing + will resume at this point for the next call of inflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. inflate() provides as much output as possible, until there + is no more input data or no more space in the output buffer (see below + about the flush parameter). + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating the next_* and avail_* values accordingly. + The application can consume the uncompressed output when it wants, for + example when the output buffer is full (avail_out == 0), or after each + call of inflate(). If inflate returns Z_OK and with zero avail_out, it + must be called again after making room in the output buffer because there + might be more output pending. + + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, + Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() stop + if and when it gets to the next deflate block boundary. When decoding the + zlib or gzip format, this will cause inflate() to return immediately after + the header and before the first block. When doing a raw inflate, inflate() + will go ahead and process the first block, and will return when it gets to + the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + Also to assist in this, on return inflate() will set strm->data_type to the + number of unused bits in the last byte taken from strm->next_in, plus 64 + if inflate() is currently decoding the last block in the deflate stream, + plus 128 if inflate() returned immediately after decoding an end-of-block + code or decoding the complete header up to just before the first byte of the + deflate stream. The end-of-block will not be indicated until all of the + uncompressed data from that block has been written to strm->next_out. The + number of unused bits may in general be greater than seven, except when + bit 7 of data_type is set, in which case the number of unused bits will be + less than eight. + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step + (a single call of inflate), the parameter flush should be set to + Z_FINISH. In this case all pending input is processed and all pending + output is flushed; avail_out must be large enough to hold all the + uncompressed data. (The size of the uncompressed data may have been saved + by the compressor for this purpose.) The next operation on this stream must + be inflateEnd to deallocate the decompression state. The use of Z_FINISH + is never required, but can be used to inform inflate that a faster approach + may be used for the single inflate() call. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the + first call. So the only effect of the flush parameter in this implementation + is on the return value of inflate(), as noted below, or when it returns early + because Z_BLOCK is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary + below), inflate sets strm->adler to the adler32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets + strm->adler to the adler32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described + below. At the end of the stream, inflate() checks that its computed adler32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + + inflate() will decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically. Any information + contained in the gzip header is not retained, so applications that need that + information should instead use raw inflate, see inflateInit2() below, or + inflateBack() and perform their own processing of the gzip header and + trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example + if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to + continue decompressing. If Z_DATA_ERROR is returned, the application may then + call inflateSync() to look for a good compression block if a partial recovery + of the data is desired. +*/ + + +ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). +*/ + + /* Advanced functions */ + +/* + The following functions are needed only in some special applications. +*/ + +/* +ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, + int memLevel, + int strategy)); + + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by + the caller. + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute an adler32 check value. + + windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), + no header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but + is slow and reduces compression ratio; memLevel=9 uses maximum memory + for optimal speed. The default value is 8. See zconf.h for total memory + usage as a function of windowBits and memLevel. + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between + Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as + Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy + parameter only affects the compression ratio but not the correctness of the + compressed output even if it is not set appropriately. Z_FIXED prevents the + use of dynamic Huffman codes, allowing for a simpler decoder for special + applications. + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid + method). msg is set to null if there is no error message. deflateInit2 does + not perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. This function must be called + immediately after deflateInit, deflateInit2 or deflateReset, before any + call of deflate. The compressor and decompressor must use exactly the same + dictionary (see inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size in + deflate or deflate2. Thus the strings most likely to be useful should be + put at the end of the dictionary, not at the front. In addition, the + current implementation of deflate will use at most the window size minus + 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the adler32 value + of the dictionary; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + adler32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if the compression method is bsort). deflateSetDictionary does not + perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and + can consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); +/* + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. + The stream will keep the same compression level and any other attributes + that may have been set by deflateInit2. + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). +*/ + +ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + int level, + int strategy)); +/* + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different + strategy. If the compression level is changed, the input available so far + is compressed with the old level (and may be flushed); the new level will + take effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to + be compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR + if strm->avail_out was zero. +*/ + +ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); +/* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + +ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, + uLong sourceLen)); +/* + deflateBound() returns an upper bound on the compressed size after + deflation of sourceLen bytes. It must be called after deflateInit() + or deflateInit2(). This would be used to allocate an output buffer + for deflation in a single pass, and so would be called before deflate(). +*/ + +ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + deflatePrime() inserts bits in the deflate output stream. The intent + is that this function is used to start off the deflate output with the + bits leftover from a previous deflate stream when appending to it. As such, + this function can only be used for raw deflate, and must be used before the + first deflate() call after a deflateInit2() or deflateReset(). bits must be + less than or equal to 16, and that many of the least significant bits of + value will be inserted in the output. + + deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); +/* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if + deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not + looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format + such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an adler32 or a crc32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For + most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + + windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is + a crc32 instead of an adler32. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg + is set to null if there is no error message. inflateInit2 does not perform + any decompression apart from reading the zlib header if present: this will + be done by inflate(). (So next_in and avail_in may be modified, but next_out + and avail_out are unchanged.) +*/ + +ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called + immediately after inflateInit2() or inflateReset() and before any call of + inflate() to set the dictionary. The application must insure that the + dictionary that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). +*/ + +ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); +/* + Skips invalid compressed data until a full flush point (see above the + description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. + + inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR + if no more input was provided, Z_DATA_ERROR if no flush point has been found, + or Z_STREAM_ERROR if the stream structure was inconsistent. In the success + case, the application may save the current current value of total_in which + indicates where valid compressed data was found. In the error case, the + application may repeatedly call inflateSync, providing more input each time, + until success or end of the input data. +*/ + +ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when randomly accessing a large stream. The + first pass through the stream can periodically record the inflate state, + allowing restarting inflate at those points when randomly accessing the + stream. + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); +/* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. + The stream will keep attributes that may have been set by inflateInit2. + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). +*/ + +ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); +/* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK can be used to + force inflate() to return immediately after header processing is complete + and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When + any of extra, name, or comment are not Z_NULL and the respective field is + not present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() + calls. The fields zalloc, zfree and opaque in strm must be initialized + before the call. If zalloc and zfree are Z_NULL, then the default library- + derived memory allocation routines are used. windowBits is the base two + logarithm of the window size, in the range 8..15. window is a caller + supplied buffer of that size. Except for special applications where it is + assured that deflate was used with small window sizes, windowBits must be 15 + and a 32K byte window must be supplied to be able to decompress general + deflate streams. + + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of + the paramaters are invalid, Z_MEM_ERROR if the internal state could not + be allocated, or Z_VERSION_ERROR if the version of the library does not + match the version of the header file. +*/ + +typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); +typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + +ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); +/* + inflateBack() does a raw inflate with a single call using a call-back + interface for input and output. This is more efficient than inflate() for + file i/o applications in that it avoids copying between the output and the + sliding window by simply making the window itself the output buffer. This + function trusts the application to not change the output buffer passed by + the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw + deflate stream with each call. inflateBackEnd() is then called to free + the allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the + header and process the trailer on its own, hence this routine expects + only the raw deflate stream to decompress. This is different from the + normal behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then + called by inflateBack() for input and output. inflateBack() calls those + routines until it reads a complete deflate stream and writes out all of the + uncompressed data, or until it encounters an error. The function's + parameters and return types are defined above in the in_func and out_func + typedefs. inflateBack() will call in(in_desc, &buf) which should return the + number of bytes of provided input, and a pointer to that input in buf. If + there is no input available, in() must return zero--buf is ignored in that + case--and inflateBack() will return a buffer error. inflateBack() will call + out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() + should return zero on success, or non-zero on failure. If out() returns + non-zero, inflateBack() will return with an error. Neither in() nor out() + are permitted to change the contents of the window provided to + inflateBackInit(), which is also the buffer that out() uses to write from. + The length written by out() will be at most the window size. Any non-zero + amount of input may be provided by in(). + + For convenience, inflateBack() can be provided input on the first call by + setting strm->next_in and strm->avail_in. If that input is exhausted, then + in() will be called. Therefore strm->next_in must be initialized before + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These + descriptors can be optionally used to pass any information that the caller- + supplied in() and out() functions need to do their job. + + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR + if in() or out() returned an error, Z_DATA_ERROR if there was a format + error in the deflate stream (in which case strm->msg is set to indicate the + nature of the error), or Z_STREAM_ERROR if the stream was not properly + initialized. In the case of Z_BUF_ERROR, an input or output error can be + distinguished using strm->next_in which will be Z_NULL only if in() returned + an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to + out() returning non-zero. (in() will always be called before out(), so + strm->next_in is assured to be defined if out() returns non-zero.) Note + that inflateBack() cannot return Z_OK. +*/ + +ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); +/* + All memory allocated by inflateBackInit() is freed. + + inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream + state was inconsistent. +*/ + +ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); +/* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + 1.0: size of uInt + 3.2: size of uLong + 5.4: size of voidpf (pointer) + 7.6: size of z_off_t + + Compiler, assembler, and debug options: + 8: DEBUG + 9: ASMV or ASMINF -- use ASM code + 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention + 11: 0 (reserved) + + One-time table building (smaller code, but not thread-safe if true): + 12: BUILDFIXED -- build static block decoding tables when needed + 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed + 14,15: 0 (reserved) + + Library content (indicates missing functionality): + 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking + deflate code when not needed) + 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect + and decode gzip streams (to avoid linking crc code) + 18-19: 0 (reserved) + + Operation variations (changes in library functionality): + 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate + 21: FASTEST -- deflate algorithm with only one, lowest compression level + 22,23: 0 (reserved) + + The sprintf variant used by gzprintf (zero is best): + 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format + 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! + 26: 0 = returns value, 1 = void -- 1 means inferred string length returned + + Remainder: + 27-31: 0 (reserved) + */ + + + /* utility functions */ + +/* + The following utility functions are implemented on top of the + basic stream-oriented functions. To simplify the interface, some + default options are assumed (compression level and memory usage, + standard memory allocation functions). The source code of these + utility functions can easily be modified if you need special options. +*/ + +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be at least the value returned + by compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + This function can be used to compress a whole file at once if the + input file is mmap'ed. + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + +ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); +/* + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ + +ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); +/* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before + a compress() or compress2() call to allocate the destination buffer. +*/ + +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. +*/ + + +typedef voidp gzFile; + +ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); +/* + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb") but can also include a compression level + ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for + Huffman only compression as in "wb1h", or 'R' for run-length encoding + as in "wb1R". (See the description of deflateInit2 for more information + about the strategy parameter.) + + gzopen can be used to read a file which is not in gzip format; in this + case gzread will directly read from the file without decompression. + + gzopen returns NULL if the file could not be opened or if there was + insufficient memory to allocate the (de)compression state; errno + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). */ + +ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); +/* + gzdopen() associates a gzFile with the file descriptor fd. File + descriptors are obtained from calls like open, dup, creat, pipe or + fileno (in the file has been previously opened with fopen). + The mode parameter is as in gzopen. + The next call of gzclose on the returned gzFile will also close the + file descriptor fd, just like fclose(fdopen(fd), mode) closes the file + descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). + gzdopen returns NULL if there was insufficient memory to allocate + the (de)compression state. +*/ + +ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); +/* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. +*/ + +ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); +/* + Reads the given number of uncompressed bytes from the compressed file. + If the input file was not in gzip format, gzread copies the given number + of bytes into the buffer. + gzread returns the number of uncompressed bytes actually read (0 for + end of file, -1 for error). */ + +ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); +/* + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes actually written + (0 in case of error). +*/ + +ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); +/* + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written (0 in case of error). The number of + uncompressed bytes written is limited to 4095. The caller should assure that + this limit is not exceeded. If it is exceeded, then gzprintf() will return + return an error (0) with nothing written. In this case, there may also be a + buffer overflow with unpredictable consequences, which is possible only if + zlib was compiled with the insecure functions sprintf() or vsprintf() + because the secure snprintf() or vsnprintf() functions were not available. +*/ + +ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); +/* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. +*/ + +ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); +/* + Reads bytes from the compressed file until len-1 characters are read, or + a newline character is read and transferred to buf, or an end-of-file + condition is encountered. The string is then terminated with a null + character. + gzgets returns buf, or Z_NULL in case of error. +*/ + +ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); +/* + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. +*/ + +ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); +/* + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. +*/ + +ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +/* + Push one character back onto the stream to be read again later. + Only one character of push-back is allowed. gzungetc() returns the + character pushed, or -1 on failure. gzungetc() will fail if a + character has been pushed but not read yet, or if c is -1. The pushed + character will be discarded if the stream is repositioned with gzseek() + or gzrewind(). +*/ + +ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); +/* + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. The return value is the zlib + error number (see function gzerror below). gzflush returns Z_OK if + the flush parameter is Z_FINISH and all output could be flushed. + gzflush should be called only when strictly necessary because it can + degrade compression. +*/ + +ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); +/* + Sets the starting position for the next gzread or gzwrite on the + given compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +*/ + +ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); +/* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) +*/ + +ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); +/* + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the + uncompressed data stream. + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +*/ + +ZEXTERN int ZEXPORT gzeof OF((gzFile file)); +/* + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. +*/ + +ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); +/* + Returns 1 if file is being read directly without decompression, otherwise + zero. +*/ + +ZEXTERN int ZEXPORT gzclose OF((gzFile file)); +/* + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. The return value is the zlib + error number (see function gzerror below). +*/ + +ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); +/* + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an + error occurred in the file system and not in the compression library, + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. +*/ + +ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); +/* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. +*/ + + /* checksum functions */ + +/* + These functions are not related to compression but are exported + anyway because they might be useful in applications using the + compression library. +*/ + +ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); +/* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is NULL, this function returns + the required initial value for the checksum. + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + adler = adler32(adler, buffer, length); + } + if (adler != original_adler) error(); +*/ + +ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); +/* + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. +*/ + +ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +/* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is NULL, this function returns the required initial + value for the for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + crc = crc32(crc, buffer, length); + } + if (crc != original_crc) error(); +*/ + +ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + +/* + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. +*/ + + + /* various hacks, don't look :) */ + +/* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ +ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); +ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); +#define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) +#define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) +#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, sizeof(z_stream)) +#define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) +#define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, sizeof(z_stream)) + + +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; /* hack for buggy compilers */ +#endif + +ZEXTERN const char * ZEXPORT zError OF((int)); +ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); +ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); + +#ifdef __cplusplus +} +#endif + +#endif /* ZLIB_H */