compilation fix for gcc4 (patch 1428840)

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 32c566a56ea1cac53f914c97e10ede9b568dcc2a..0c56b6f60d49c98169ba10dd6355f99045f496a3 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -10,12 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*

-This sample shows how to use the common dialogs available from wxWidgets. 
+This sample shows how to use the common dialogs available from wxWidgets.

 It also shows that generic implementations of common dialogs can be exchanged
 with native dialogs and can coexist in one application. The need for generic
 dialogs addition is recognized thanks to setup of below USE_*** setting. Their
 It also shows that generic implementations of common dialogs can be exchanged
 with native dialogs and can coexist in one application. The need for generic
 dialogs addition is recognized thanks to setup of below USE_*** setting. Their

-combinations reflects conditions of makefiles and project files to avoid unresolved 
-references during linking. For now some generic dialogs are added in static builds 
+combinations reflects conditions of makefiles and project files to avoid unresolved
+references during linking. For now some generic dialogs are added in static builds

 of MSW, MAC and OS2
 */
 
 of MSW, MAC and OS2
 */
 


@@ -46,6 +46,12 @@ of MSW, MAC and OS2
     #define USE_WXMAC 0
 #endif
 
     #define USE_WXMAC 0
 #endif
 

+#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2) && USE_NATIVE_FONT_DIALOG_FOR_MACOSX
+    #define USE_WXMACFONTDLG 1
+#else
+    #define USE_WXMACFONTDLG 0
+#endif
+

 #ifdef __WXGTK__
     #define USE_WXGTK 1
 #else
 #ifdef __WXGTK__
     #define USE_WXGTK 1
 #else


@@ -67,12 +73,24 @@ of MSW, MAC and OS2
 #define USE_FILEDLG_GENERIC \
     ((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
 #define USE_FONTDLG_GENERIC \
 #define USE_FILEDLG_GENERIC \
     ((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
 #define USE_FONTDLG_GENERIC \

-    ((USE_WXMSW || 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)
+#if defined(__SMARTPHONE__) || !wxUSE_BOOKCTRL
+    #define USE_MODAL_PRESENTATION 0
+#else
+    #define USE_MODAL_PRESENTATION 1
+#endif

 
 
 
 

-// Turn to 0 if there is any reason for not presenting difference between 
-// modal and modeless dialogs (ie. not implemented it in your port yet)
-#define USE_MODAL_PRESENTATION       1
+// 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
 
 
 // Define a new application type


@@ -118,6 +136,38 @@ private:
 
 #endif // USE_MODAL_PRESENTATION
 
 
 #endif // USE_MODAL_PRESENTATION
 

+#if USE_SETTINGS_DIALOG
+// Property sheet dialog
+class SettingsDialog: public wxPropertySheetDialog
+{
+DECLARE_CLASS(SettingsDialog)
+public:
+    SettingsDialog(wxWindow* parent, bool useToolBook = false);
+    ~SettingsDialog();
+
+    wxPanel* CreateGeneralSettingsPage(wxWindow* parent);
+    wxPanel* CreateAestheticSettingsPage(wxWindow* parent);
+
+protected:
+
+    enum {
+        ID_SHOW_TOOLTIPS = 100,
+        ID_AUTO_SAVE,
+        ID_AUTO_SAVE_MINS,
+        ID_LOAD_LAST_PROJECT,
+
+        ID_APPLY_SETTINGS_TO,
+        ID_BACKGROUND_STYLE,
+        ID_FONT_SIZE
+    };
+
+    wxImageList*    m_imageList;
+
+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
 {


@@ -181,6 +231,8 @@ 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
 #endif // USE_MODAL_PRESENTATION
 
 #if wxUSE_PROGRESSDLG


@@ -205,6 +257,8 @@ public:
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif // USE_FONTDLG_GENERIC
 
     void ChooseFontGeneric(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);
 


@@ -232,7 +286,7 @@ private:
 class MyCanvas: public wxScrolledWindow
 {
 public:
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas(wxWindow *parent) : 
+    MyCanvas(wxWindow *parent) :

        wxScrolledWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }
 
     void OnPaint(wxPaintEvent& event);
        wxScrolledWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }
 
     void OnPaint(wxPaintEvent& event);


@@ -268,12 +322,16 @@ 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_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_REPLACE,
     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_REPLACE,

-    DIALOGS_REQUEST
+    DIALOGS_REQUEST,
+    DIALOGS_PROPERTY_SHEET,
+    DIALOGS_PROPERTY_SHEET_TOOLBOOK

 };
 
 #endif
 };
 
 #endif