Convert line-endings to proper style

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 7629330a8305c6d563d621c28784bd3e8aac03cb..79e8c49d694d02e3bc9f8e99289e8c3bb1932ec0 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -78,13 +78,21 @@ of MSW, MAC and OS2
 
 // 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,6 +136,7 @@ private:
 
 #endif // USE_MODAL_PRESENTATION
 
 
 #endif // USE_MODAL_PRESENTATION
 

+#if USE_SETTINGS_DIALOG

 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
 {
 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
 {


@@ -154,6 +163,8 @@ protected:
 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
 {