X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b9238077a5f33df448dbba0c3b8662af608500b..3ff414ad4d9cecf9806fcc3b216f691beb72df58:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index cd8f989262..9828815a22 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -27,6 +27,7 @@ #include "wx/bookctrl.h" #include "wx/artprov.h" #include "wx/imaglist.h" +#include "wx/sysopt.h" #if wxUSE_COLOURDLG #include "wx/colordlg.h" @@ -48,6 +49,14 @@ #include "wx/progdlg.h" #endif // wxUSE_PROGRESSDLG +#if wxUSE_ABOUTDLG + #include "wx/aboutdlg.h" + + // these headers are only needed for custom about dialog + #include "wx/statline.h" + #include "wx/generic/aboutdlgg.h" +#endif // wxUSE_ABOUTDLG + #if wxUSE_BUSYINFO #include "wx/busyinfo.h" #endif // wxUSE_BUSYINFO @@ -154,6 +163,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if USE_MODAL_PRESENTATION EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg) EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg) + EVT_MENU(DIALOGS_CENTRE_SCREEN, MyFrame::DlgCenteredScreen) + EVT_MENU(DIALOGS_CENTRE_PARENT, MyFrame::DlgCenteredParent) #endif // USE_MODAL #if wxUSE_STARTUP_TIPS @@ -176,6 +187,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_PROGRESS, MyFrame::ShowProgress) #endif // wxUSE_PROGRESSDLG +#if wxUSE_ABOUTDLG + EVT_MENU(DIALOGS_ABOUTDLG_SIMPLE, MyFrame::ShowSimpleAboutDialog) + EVT_MENU(DIALOGS_ABOUTDLG_FANCY, MyFrame::ShowFancyAboutDialog) + EVT_MENU(DIALOGS_ABOUTDLG_FULL, MyFrame::ShowFullAboutDialog) + EVT_MENU(DIALOGS_ABOUTDLG_CUSTOM, MyFrame::ShowCustomAboutDialog) +#endif // wxUSE_ABOUTDLG + #if wxUSE_BUSYINFO EVT_MENU(DIALOGS_BUSYINFO, MyFrame::ShowBusyInfo) #endif // wxUSE_BUSYINFO @@ -193,7 +211,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if USE_SETTINGS_DIALOG EVT_MENU(DIALOGS_PROPERTY_SHEET, MyFrame::OnPropertySheet) - EVT_MENU(DIALOGS_PROPERTY_SHEET_TOOLBOOK, MyFrame::OnPropertySheetToolBook) + EVT_MENU(DIALOGS_PROPERTY_SHEET_TOOLBOOK, MyFrame::OnPropertySheet) + EVT_MENU(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, MyFrame::OnPropertySheet) #endif EVT_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention) @@ -223,16 +242,16 @@ bool MyApp::OnInit() wxInitAllImageHandlers(); #endif - m_canvasTextColour = wxColour(_T("BLACK")); + m_canvasTextColour = *wxBLACK; m_canvasFont = *wxNORMAL_FONT; // Create the main frame window MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets dialogs example")); // Make a menubar - wxMenu *file_menu = new wxMenu; + wxMenu *menuDlg = new wxMenu; - file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); + menuDlg->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG @@ -264,7 +283,7 @@ bool MyApp::OnInit() choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)")); #endif // USE_FONTDLG_GENERIC - file_menu->Append(wxID_ANY,_T("&Choices and selectors"),choices_menu); + menuDlg->Append(wxID_ANY,_T("&Choices and selectors"),choices_menu); #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG @@ -281,7 +300,7 @@ bool MyApp::OnInit() entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N")); #endif // wxUSE_NUMBERDLG - file_menu->Append(wxID_ANY,_T("&Entry dialogs"),entry_menu); + menuDlg->Append(wxID_ANY,_T("&Entry dialogs"),entry_menu); #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG @@ -301,7 +320,7 @@ bool MyApp::OnInit() filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, _T("Sa&ve file (generic)")); #endif // USE_FILEDLG_GENERIC - file_menu->Append(wxID_ANY,_T("&File operations"),filedlg_menu); + menuDlg->Append(wxID_ANY,_T("&File operations"),filedlg_menu); #endif // wxUSE_FILEDLG @@ -310,7 +329,7 @@ bool MyApp::OnInit() dir_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D")); dir_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); - file_menu->Append(wxID_ANY,_T("&Directory operations"),dir_menu); + menuDlg->Append(wxID_ANY,_T("&Directory operations"),dir_menu); #if USE_DIRDLG_GENERIC dir_menu->AppendSeparator(); @@ -340,7 +359,7 @@ bool MyApp::OnInit() info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L")); #endif // wxUSE_LOG_DIALOG - file_menu->Append(wxID_ANY,_T("&Informative dialogs"),info_menu); + menuDlg->Append(wxID_ANY,_T("&Informative dialogs"),info_menu); #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG @@ -349,29 +368,53 @@ bool MyApp::OnInit() wxMenu *find_menu = new wxMenu; find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F")); find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F")); - file_menu->Append(wxID_ANY,_T("&Searching"),find_menu); + menuDlg->Append(wxID_ANY,_T("&Searching"),find_menu); #endif // wxUSE_FINDREPLDLG #if USE_MODAL_PRESENTATION - wxMenu *modal_menu = new wxMenu; - modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); - modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z")); - file_menu->Append(wxID_ANY,_T("&Modal/Modeless"),modal_menu); + wxMenu *dialogs_menu = new wxMenu; + dialogs_menu->Append(DIALOGS_MODAL, _T("&Modal dialog\tCtrl-W")); + dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z")); + dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1")); + dialogs_menu->Append(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2")); + menuDlg->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu); #endif // USE_MODAL_PRESENTATION #if USE_SETTINGS_DIALOG - file_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Property Sheet Dialog\tCtrl-P")); - file_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("Property Sheet Dialog using &ToolBook")); + wxMenu *sheet_menu = new wxMenu; + sheet_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Standard property sheet\tShift-Ctrl-P")); + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("&Toolbook sheet\tShift-Ctrl-T")); + + if (wxPlatformIs(wxPORT_MAC)) + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U")); +/* +#ifdef __WXMAC__ + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U")); #endif +*/ + menuDlg->Append(wxID_ANY, _T("&Property sheets"), sheet_menu); +#endif // USE_SETTINGS_DIALOG + + menuDlg->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R")); + + menuDlg->AppendSeparator(); + menuDlg->Append(wxID_EXIT, _T("E&xit\tAlt-X")); - file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R")); +#if wxUSE_ABOUTDLG + wxMenu *menuHelp = new wxMenu; + menuHelp->Append(DIALOGS_ABOUTDLG_SIMPLE, _T("&About (simple)...\tF1")); + menuHelp->Append(DIALOGS_ABOUTDLG_FANCY, _T("About (&fancy)...\tShift-F1")); + menuHelp->Append(DIALOGS_ABOUTDLG_FULL, _T("About (f&ull)...\tCtrl-F1")); + menuHelp->Append(DIALOGS_ABOUTDLG_CUSTOM, _T("About (&custom)...\tCtrl-Shift-F1")); +#endif // wxUSE_ABOUTDLG - file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X")); + wxMenuBar *menubar = new wxMenuBar; + menubar->Append(menuDlg, _T("&Dialogs")); +#if wxUSE_ABOUTDLG + menubar->Append(menuHelp, _T("&Help")); +#endif // wxUSE_ABOUTDLG - wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, _T("&File")); - frame->SetMenuBar(menu_bar); + frame->SetMenuBar(menubar); myCanvas = new MyCanvas(frame); myCanvas->SetBackgroundColour(*wxWHITE); @@ -416,6 +459,10 @@ MyFrame::MyFrame(wxWindow *parent, ); } #endif // wxUSE_COLOURDLG + +#if wxUSE_STATUSBAR + CreateStatusBar(); +#endif // wxUSE_STATUSBAR } #if wxUSE_COLOURDLG @@ -497,7 +544,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) data.SetInitialFont(wxGetApp().m_canvasFont); data.SetColour(wxGetApp().m_canvasTextColour); - wxGenericFontDialog *dialog = new wxGenericFontDialog(this, &data); + wxGenericFontDialog *dialog = new wxGenericFontDialog(this, data); if (dialog->ShowModal() == wxID_OK) { wxFontData retData = dialog->GetFontData(); @@ -680,8 +727,8 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) #endif ); - dialog.SetDirectory(wxGetHomeDir()); dialog.CentreOnParent(); + dialog.SetDirectory(wxGetHomeDir()); if (dialog.ShowModal() == wxID_OK) { @@ -713,7 +760,7 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) ) wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr ), - wxCHANGE_DIR, + wxFD_OPEN|wxFD_CHANGE_DIR|wxFD_PREVIEW, this ); @@ -742,7 +789,7 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) #endif wxFileDialog dialog(this, _T("Testing open multiple file dialog"), wxEmptyString, wxEmptyString, wildcards, - wxMULTIPLE); + wxFD_OPEN|wxFD_MULTIPLE); if (dialog.ShowModal() == wxID_OK) { @@ -775,7 +822,7 @@ void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) ) wxEmptyString, _T("myletter.doc"), _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"), - wxSAVE|wxOVERWRITE_PROMPT); + wxFD_SAVE|wxFD_OVERWRITE_PROMPT); dialog.SetFilterIndex(1); @@ -817,10 +864,14 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) ) void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) ) { + // On PocketPC you can disable OK-only dialogs policy using system option + int buttons = wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")); + wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), 1); + wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h"); wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"), wxEmptyString, wxEmptyString, wildcards, - wxMULTIPLE); + wxFD_MULTIPLE); if (dialog.ShowModal() == wxID_OK) { @@ -844,6 +895,9 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) ) wxMessageDialog dialog2(this, msg, _T("Selected files")); dialog2.ShowModal(); } + + // restore system option + wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), buttons); } void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) ) @@ -853,7 +907,7 @@ void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) ) wxEmptyString, _T("myletter.doc"), _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"), - wxSAVE|wxOVERWRITE_PROMPT); + wxFD_SAVE|wxFD_OVERWRITE_PROMPT); dialog.SetFilterIndex(1); @@ -882,12 +936,12 @@ void MyFrame::DoDirChoose(int style) void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) { - DoDirChoose(wxDD_DEFAULT_STYLE & ~wxDD_NEW_DIR_BUTTON); + DoDirChoose(wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); } void MyFrame::DirChooseNew(wxCommandEvent& WXUNUSED(event) ) { - DoDirChoose(wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON); + DoDirChoose(wxDD_DEFAULT_STYLE & ~wxDD_DIR_MUST_EXIST); } #endif // wxUSE_DIRDLG @@ -940,6 +994,25 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) m_dialog->Hide(); } } + +void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event)) +{ + wxDialog dlg(this, wxID_ANY, _T("Dialog centered on screen"), + wxDefaultPosition, wxSize(200, 100)); + (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre(); + dlg.CentreOnScreen(); + dlg.ShowModal(); +} + +void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event)) +{ + wxDialog dlg(this, wxID_ANY, _T("Dialog centered on parent"), + wxDefaultPosition, wxSize(200, 100)); + (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre(); + dlg.CentreOnParent(); + dlg.ShowModal(); +} + #endif // USE_MODAL_PRESENTATION #if wxUSE_STARTUP_TIPS @@ -972,15 +1045,9 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_STARTUP_TIPS #if USE_SETTINGS_DIALOG -void MyFrame::OnPropertySheet(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnPropertySheet(wxCommandEvent& event) { - SettingsDialog dialog(this); - dialog.ShowModal(); -} - -void MyFrame::OnPropertySheetToolBook(wxCommandEvent& WXUNUSED(event)) -{ - SettingsDialog dialog(this, true); + SettingsDialog dialog(this, event.GetId()); dialog.ShowModal(); } #endif // USE_SETTINGS_DIALOG @@ -1003,33 +1070,7 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) { - #if wxUSE_STOPWATCH && wxUSE_LONGLONG - // check the performance - int countrandomnumbers = 0, count = 0; - wxTimeSpan tsTest(0,0,0,250); - wxDateTime DT2, DT1 = wxDateTime::UNow(); - srand(0); - while(1) - { - rand(); - ++countrandomnumbers; - if ( countrandomnumbers == 1000 ) - { - srand(0); - countrandomnumbers = 0; - ++count; - DT2 = wxDateTime::UNow(); - wxTimeSpan ts = DT2.Subtract( DT1 ); - if ( ts.IsLongerThan( tsTest ) ) - { - break; - } - } - } - const int max = 40 * count; - #else - static const int max = 10; - #endif // wxUSE_STOPWATCH && wxUSE_LONGLONG + static const int max = 100; wxProgressDialog dialog(_T("Progress dialog example"), _T("An informative message"), @@ -1041,53 +1082,48 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) // wxPD_AUTO_HIDE | -- try this as well wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME | - wxPD_SMOOTH); + wxPD_REMAINING_TIME + | wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small + ); bool cont = true; - bool skip = false; - // each skip will move progress about quarter forward - for ( int i = 0; i <= max; i = wxMin(i+(skip?int(max/4):1), max+1), skip = false ) + for ( int i = 0; i <= max; i++ ) { - #if wxUSE_STOPWATCH && wxUSE_LONGLONG - // do (almost) the same operations as we did for the performance test - srand(0); - for ( int j = 0; j < 1000; j++ ) - { - rand(); - if ( j == 999 ) - { - DT2 = wxDateTime::UNow(); - wxTimeSpan ts = DT2.Subtract( DT1 ); - if ( ts.IsLongerThan( tsTest ) ) - { - // nothing to do - } - } - } - #else - wxSleep(1); - #endif + wxMilliSleep(200); wxString msg; + // test both modes of wxProgressDialog behaviour: start in + // indeterminate mode but switch to the determinate one later + const bool determinate = i > max/2; + if ( i == max ) { msg = _T("That's all, folks!"); } - else if ( i > max / 2 ) + else if ( !determinate ) + { + msg = _T("Testing indeterminate mode"); + } + else if ( determinate ) { - msg = _T("Only a half left (very long message)!"); + msg = _T("Now in standard determinate mode"); } -#if wxUSE_STOPWATCH && wxUSE_LONGLONG - if ( (i % (max/100)) == 0 ) // // only 100 updates, this makes it much faster + // will be set to true if "Skip" button was pressed + bool skip = false; + if ( determinate ) { cont = dialog.Update(i, msg, &skip); } -#else - cont = dialog.Update(i, msg, &skip); -#endif + else + { + cont = dialog.Pulse(msg, &skip); + } + + // each skip will move progress about quarter forward + if ( skip ) + i += max/4; if ( !cont ) { @@ -1113,6 +1149,110 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) #endif // wxUSE_PROGRESSDLG +#if wxUSE_ABOUTDLG + +static void InitAboutInfoMinimal(wxAboutDialogInfo& info) +{ + info.SetName(_T("Dialogs Sample")); + info.SetVersion(wxVERSION_NUM_DOT_STRING_T); + info.SetDescription(_T("This sample shows different wxWidgets dialogs")); + info.SetCopyright(_T("(C) 1998-2006 wxWidgets dev team")); + info.AddDeveloper(_T("Vadim Zeitlin")); +} + +static void InitAboutInfoWebsite(wxAboutDialogInfo& info) +{ + InitAboutInfoMinimal(info); + + info.SetWebSite(_T("http://www.wxwidgets.org/"), _T("wxWidgets web site")); +} + +static void InitAboutInfoAll(wxAboutDialogInfo& info) +{ + InitAboutInfoMinimal(info); + + // we can add a second developer + info.AddDeveloper(_T("A.N. Other")); + + // or we can add several persons at once like this + static const wxChar *docwriters[] = + { + _T("First D. Writer"), + _T("Second One"), + }; + + info.SetDocWriters(wxArrayString(WXSIZEOF(docwriters), docwriters)); + info.SetLicence(wxString::FromAscii( +" wxWindows Library Licence, Version 3.1\n" +" ======================================\n" +"\n" +" Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al\n" +"\n" +" Everyone is permitted to copy and distribute verbatim copies\n" +" of this licence document, but changing it is not allowed.\n" +"\n" +" WXWINDOWS LIBRARY LICENCE\n" +" TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n" +"\n" +" ...and so on and so forth...\n" + )); + + info.AddTranslator(_T("Wun Ngo Wen (Martian)")); +} + +void MyFrame::ShowSimpleAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoMinimal(info); + + wxAboutBox(info); +} + +void MyFrame::ShowFancyAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoWebsite(info); + + wxAboutBox(info); +} + +void MyFrame::ShowFullAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoAll(info); + + wxAboutBox(info); +} + +// a trivial example of a custom dialog class +class MyAboutDialog : public wxGenericAboutDialog +{ +public: + MyAboutDialog(const wxAboutDialogInfo& info) + { + Create(info); + } + + // add some custom controls + virtual void DoAddCustomControls() + { + AddControl(new wxStaticLine(this), wxSizerFlags().Expand()); + AddText(_T("Some custom text")); + AddControl(new wxStaticLine(this), wxSizerFlags().Expand()); + } +}; + +void MyFrame::ShowCustomAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoAll(info); + + MyAboutDialog dlg(info); + dlg.ShowModal(); +} + +#endif // wxUSE_ABOUTDLG + #if wxUSE_BUSYINFO void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event)) @@ -1381,18 +1521,31 @@ IMPLEMENT_CLASS(SettingsDialog, wxPropertySheetDialog) BEGIN_EVENT_TABLE(SettingsDialog, wxPropertySheetDialog) END_EVENT_TABLE() -SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook) +SettingsDialog::SettingsDialog(wxWindow* win, int dialogType) { SetExtraStyle(wxDIALOG_EX_CONTEXTHELP|wxWS_EX_VALIDATE_RECURSIVELY); int tabImage1 = -1; int tabImage2 = -1; - + + bool useToolBook = (dialogType == DIALOGS_PROPERTY_SHEET_TOOLBOOK || dialogType == DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK); + int resizeBorder = wxRESIZE_BORDER; + if (useToolBook) { + resizeBorder = 0; tabImage1 = 0; tabImage2 = 1; - SetSheetStyle(wxPROPSHEET_TOOLBOOK|wxPROPSHEET_SHRINKTOFIT); + + int sheetStyle = wxPROPSHEET_SHRINKTOFIT; + if (dialogType == DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK) + sheetStyle |= wxPROPSHEET_BUTTONTOOLBOOK; + else + sheetStyle |= wxPROPSHEET_TOOLBOOK; + + SetSheetStyle(sheetStyle); + SetSheetInnerBorder(0); + SetSheetOuterBorder(0); // create a dummy image list with a few icons const wxSize imageSize(32, 32); @@ -1411,18 +1564,13 @@ SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook) m_imageList = NULL; Create(win, wxID_ANY, _("Preferences"), wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE -#ifndef __WXWINCE__ - |wxRESIZE_BORDER -#endif + wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder) ); - // If using a toolbook, also follow Mac style and don't create buttons + // If using a toolbook, also follow Mac style and don't create buttons if (!useToolBook) - CreateButtons(wxOK|wxCANCEL -#ifndef __POCKETPC__ - |wxHELP -#endif + CreateButtons(wxOK | wxCANCEL | + (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, wxHELP) ); wxBookCtrlBase* notebook = GetBookCtrl();