X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f5d8ecf3495bae0ec5da208525d209a42a7c256..4ff53d1b7a714df97b2b4e584c67c69037fc47b8:/samples/dialogs/dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 7629330a83..0c56b6f60d 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -78,13 +78,21 @@ of MSW, MAC and OS2
 
 // Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference
 // between modal and modeless dialogs (ie. not implemented it in your port yet)
-#if defined(__SMARTPHONE__)
+#if defined(__SMARTPHONE__) || !wxUSE_BOOKCTRL
     #define USE_MODAL_PRESENTATION 0
 #else
     #define USE_MODAL_PRESENTATION 1
 #endif
 
 
+// Turn USE_SETTINGS_DIALOG to 0 if supported
+#if wxUSE_BOOKCTRL
+    #define USE_SETTINGS_DIALOG 1
+#else
+    #define USE_SETTINGS_DIALOG 0
+#endif
+
+
 // Define a new application type
 class MyApp: public wxApp
 {
@@ -128,12 +136,14 @@ private:
 
 #endif // USE_MODAL_PRESENTATION
 
+#if USE_SETTINGS_DIALOG
 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
 {
 DECLARE_CLASS(SettingsDialog)
 public:
-    SettingsDialog(wxWindow* parent);
+    SettingsDialog(wxWindow* parent, bool useToolBook = false);
+    ~SettingsDialog();
 
     wxPanel* CreateGeneralSettingsPage(wxWindow* parent);
     wxPanel* CreateAestheticSettingsPage(wxWindow* parent);
@@ -151,9 +161,13 @@ protected:
         ID_FONT_SIZE
     };
 
+    wxImageList*    m_imageList;
+
 DECLARE_EVENT_TABLE()
 };
 
+#endif // USE_SETTINGS_DIALOG
+
 // Define a new frame type
 class MyFrame: public wxFrame
 {
@@ -217,6 +231,8 @@ public:
 #if USE_MODAL_PRESENTATION
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
+    void DlgCenteredScreen(wxCommandEvent& event);
+    void DlgCenteredParent(wxCommandEvent& event);
 #endif // USE_MODAL_PRESENTATION
 
 #if wxUSE_PROGRESSDLG
@@ -242,6 +258,7 @@ public:
 #endif // USE_FONTDLG_GENERIC
 
     void OnPropertySheet(wxCommandEvent& event);
+    void OnPropertySheetToolBook(wxCommandEvent& event);
     void OnRequestUserAttention(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 
@@ -305,13 +322,16 @@ enum
     DIALOGS_LOG_DIALOG,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
+    DIALOGS_CENTRE_SCREEN,
+    DIALOGS_CENTRE_PARENT,
     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_REPLACE,
     DIALOGS_REQUEST,
-    DIALOGS_PROPERTY_SHEET
+    DIALOGS_PROPERTY_SHEET,
+    DIALOGS_PROPERTY_SHEET_TOOLBOOK
 };
 
 #endif