Use SetMinSize instead of SetSizeHints

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 32c566a56ea1cac53f914c97e10ede9b568dcc2a..6f225aa991de915ea2be76ccbf77c03a17623448 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,16 @@ 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 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_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__)
+    #define USE_MODAL_PRESENTATION 0
+#else
+    #define USE_MODAL_PRESENTATION 1
+#endif

 
 
 // Define a new application type
 
 
 // Define a new application type


@@ -232,7 +242,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);