Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

[wxWidgets.git] / samples / dialogs / dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 7629330a8305c6d563d621c28784bd3e8aac03cb..12a64d9a63fdc5d939858435c43e21490ab1ccac 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -34,7 +34,13 @@ of MSW, MAC and OS2
     #define USE_DLL 0
 #endif
 
     #define USE_DLL 0
 #endif
 

-#if defined(__WXMSW__) && !defined(__WXWINCE__)
+#if defined(__WXWINCE__)
+    #define USE_WXWINCE 1
+#else
+    #define USE_WXWINCE 0
+#endif
+
+#if defined(__WXMSW__) && !USE_WXWINCE

     #define USE_WXMSW 1
 #else
     #define USE_WXMSW 0
     #define USE_WXMSW 1
 #else
     #define USE_WXMSW 0


@@ -71,20 +77,27 @@ of MSW, MAC and OS2
 #define USE_DIRDLG_GENERIC \
     ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
 #define USE_FILEDLG_GENERIC \
 #define USE_DIRDLG_GENERIC \
     ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
 #define USE_FILEDLG_GENERIC \

-    ((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
+    ((((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)

 #define USE_FONTDLG_GENERIC \
 #define USE_FONTDLG_GENERIC \

-    ((USE_WXMSW || USE_WXMACFONTDLG ||USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
-
+    ((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)

 
 // 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)
 
 // 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
 
 
     #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
 {
 // Define a new application type
 class MyApp: public wxApp
 {


@@ -128,12 +141,14 @@ private:
 
 #endif // USE_MODAL_PRESENTATION
 
 
 #endif // USE_MODAL_PRESENTATION
 

+#if USE_SETTINGS_DIALOG

 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
 {
 DECLARE_CLASS(SettingsDialog)
 public:
 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
 {
 DECLARE_CLASS(SettingsDialog)
 public:

-    SettingsDialog(wxWindow* parent);
+    SettingsDialog(wxWindow* parent, int dialogType);
+    ~SettingsDialog();

 
     wxPanel* CreateGeneralSettingsPage(wxWindow* parent);
     wxPanel* CreateAestheticSettingsPage(wxWindow* parent);
 
     wxPanel* CreateGeneralSettingsPage(wxWindow* parent);
     wxPanel* CreateAestheticSettingsPage(wxWindow* parent);


@@ -151,9 +166,13 @@ protected:
         ID_FONT_SIZE
     };
 
         ID_FONT_SIZE
     };
 

+    wxImageList*    m_imageList;
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

+#endif // USE_SETTINGS_DIALOG
+

 // Define a new frame type
 class MyFrame: public wxFrame
 {
 // Define a new frame type
 class MyFrame: public wxFrame
 {


@@ -217,12 +236,21 @@ public:
 #if USE_MODAL_PRESENTATION
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
 #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
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG
 
 #endif // USE_MODAL_PRESENTATION
 
 #if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG
 

+#if wxUSE_ABOUTDLG
+    void ShowSimpleAboutDialog(wxCommandEvent& event);
+    void ShowFancyAboutDialog(wxCommandEvent& event);
+    void ShowFullAboutDialog(wxCommandEvent& event);
+    void ShowCustomAboutDialog(wxCommandEvent& event);
+#endif // wxUSE_ABOUTDLG
+

 #if wxUSE_BUSYINFO
     void ShowBusyInfo(wxCommandEvent& event);
 #endif // wxUSE_BUSYINFO
 #if wxUSE_BUSYINFO
     void ShowBusyInfo(wxCommandEvent& event);
 #endif // wxUSE_BUSYINFO


@@ -305,13 +333,21 @@ enum
     DIALOGS_LOG_DIALOG,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_LOG_DIALOG,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,

+    DIALOGS_CENTRE_SCREEN,
+    DIALOGS_CENTRE_PARENT,

     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,
     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,

+    DIALOGS_ABOUTDLG_SIMPLE,
+    DIALOGS_ABOUTDLG_FANCY,
+    DIALOGS_ABOUTDLG_FULL,
+    DIALOGS_ABOUTDLG_CUSTOM,

     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_REPLACE,
     DIALOGS_REQUEST,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_REPLACE,
     DIALOGS_REQUEST,

-    DIALOGS_PROPERTY_SHEET
+    DIALOGS_PROPERTY_SHEET,
+    DIALOGS_PROPERTY_SHEET_TOOLBOOK,
+    DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK

 };
 
 #endif
 };
 
 #endif