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 6b9b05064e44ff7fa04dba5722ba416816a71945..12a64d9a63fdc5d939858435c43e21490ab1ccac 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -147,7 +147,7 @@ class SettingsDialog: public wxPropertySheetDialog
 {
 DECLARE_CLASS(SettingsDialog)
 public:
 {
 DECLARE_CLASS(SettingsDialog)
 public:

-    SettingsDialog(wxWindow* parent, bool useToolBook = false);
+    SettingsDialog(wxWindow* parent, int dialogType);

     ~SettingsDialog();
 
     wxPanel* CreateGeneralSettingsPage(wxWindow* parent);
     ~SettingsDialog();
 
     wxPanel* CreateGeneralSettingsPage(wxWindow* parent);


@@ -244,6 +244,13 @@ public:
     void ShowProgress(wxCommandEvent& event);
 #endif // 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


@@ -263,7 +270,6 @@ public:
 #endif // USE_FONTDLG_GENERIC
 
     void OnPropertySheet(wxCommandEvent& event);
 #endif // USE_FONTDLG_GENERIC
 
     void OnPropertySheet(wxCommandEvent& event);

-    void OnPropertySheetToolBook(wxCommandEvent& event);

     void OnRequestUserAttention(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 
     void OnRequestUserAttention(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 


@@ -331,12 +337,17 @@ enum
     DIALOGS_CENTRE_PARENT,
     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,
     DIALOGS_CENTRE_PARENT,
     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_PROPERTY_SHEET,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_REPLACE,
     DIALOGS_REQUEST,
     DIALOGS_PROPERTY_SHEET,

-    DIALOGS_PROPERTY_SHEET_TOOLBOOK
+    DIALOGS_PROPERTY_SHEET_TOOLBOOK,
+    DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK

 };
 
 #endif
 };
 
 #endif