Fixups for solaris; remove '-mt' from pkg-config output and add '-lX11' for a static...

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index f140a81b702432f17678f31290e023670ce5428b..79e8c49d694d02e3bc9f8e99289e8c3bb1932ec0 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -9,6 +9,16 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+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
+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
+*/
+

 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 


@@ -18,6 +28,12 @@
     #define USE_WXUNIVERSAL 0
 #endif
 
     #define USE_WXUNIVERSAL 0
 #endif
 

+#ifdef WXUSINGDLL
+    #define USE_DLL 1
+#else
+    #define USE_DLL 0
+#endif
+

 #if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define USE_WXMSW 1
 #else
 #if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define USE_WXMSW 1
 #else


@@ -30,6 +46,12 @@
     #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


@@ -42,43 +64,34 @@
     #define USE_WXPM 0
 #endif
 
     #define USE_WXPM 0
 #endif
 

-#define USE_COLOURDLG_GENERIC                       \
-    (                                               \
-        wxUSE_COLOURDLG &&                          \
-        ( USE_WXMSW || USE_WXMAC ) &&               \
-        !USE_WXUNIVERSAL                            \
-    )
-
-
-#define USE_DIRDLG_GENERIC                          \
-    (                                               \
-        wxUSE_DIRDLG &&                             \
-        ( USE_WXMSW || USE_WXMAC ) &&               \
-        !USE_WXUNIVERSAL                            \
-    )
-
-#define USE_FILEDLG_GENERIC                         \
-    (                                               \
-        wxUSE_FILEDLG &&                            \
-        ( USE_WXMSW || USE_WXMAC || USE_WXPM ) &&   \
-        !USE_WXUNIVERSAL                            \
-    )
-
-#define USE_FONTDLG_GENERIC                         \
-    (                                               \
-        wxUSE_FONTDLG &&                            \
-        ( USE_WXMSW || USE_WXPM ) &&                \
-        !USE_WXUNIVERSAL                            \
-    )
-
-
-#define USE_MODAL_PRESENTATION                      \
-    (                                               \
-        USE_WXMSW ||                                \
-        USE_WXMAC ||                                \
-        USE_WXGTK ||                                \
-        USE_WXPM                                    \
-    )
+#define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL)
+
+#define USE_COLOURDLG_GENERIC \
+    ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
+#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)
+#define USE_FONTDLG_GENERIC \
+    ((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 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


@@ -123,6 +136,35 @@ 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);
+
+    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
+    };
+
+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
 {


@@ -210,6 +252,8 @@ public:
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif // USE_FONTDLG_GENERIC
 
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif // USE_FONTDLG_GENERIC
 

+    void OnPropertySheet(wxCommandEvent& event);
+    void OnRequestUserAttention(wxCommandEvent& event);

     void OnExit(wxCommandEvent& event);
 
 private:
     void OnExit(wxCommandEvent& event);
 
 private:


@@ -236,7 +280,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);


@@ -276,7 +320,9 @@ enum
     DIALOGS_PROGRESS,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
     DIALOGS_PROGRESS,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,

-    DIALOGS_REPLACE
+    DIALOGS_REPLACE,
+    DIALOGS_REQUEST,
+    DIALOGS_PROPERTY_SHEET

 };
 
 #endif
 };
 
 #endif