Fixes for wxUSE_STATUSBAR.

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index b0f79f011630f651bf12f5e4e69fede5524d1b8c..f140a81b702432f17678f31290e023670ce5428b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -2,16 +2,84 @@
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo
 // Author:      Julian Smart
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo
 // Author:      Julian Smart

-// Modified by:
+// Modified by: ABX (2004) - adjustementd for conditional building

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 

+#ifdef __WXUNIVERSAL__
+    #define USE_WXUNIVERSAL 1
+#else
+    #define USE_WXUNIVERSAL 0
+#endif
+
+#if defined(__WXMSW__) && !defined(__WXWINCE__)
+    #define USE_WXMSW 1
+#else
+    #define USE_WXMSW 0
+#endif
+
+#ifdef __WXMAC__
+    #define USE_WXMAC 1
+#else
+    #define USE_WXMAC 0
+#endif
+
+#ifdef __WXGTK__
+    #define USE_WXGTK 1
+#else
+    #define USE_WXGTK 0
+#endif
+
+#ifdef __WXPM__
+    #define USE_WXPM 1
+#else
+    #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 a new application type
 class MyApp: public wxApp
 {
 // Define a new application type
 class MyApp: public wxApp
 {


@@ -22,39 +90,154 @@ public:
     wxColour     m_canvasTextColour;
 };
 
     wxColour     m_canvasTextColour;
 };
 

+#if USE_MODAL_PRESENTATION
+
+// A custom modeless dialog
+class MyModelessDialog : public wxDialog
+{
+public:
+    MyModelessDialog(wxWindow *parent);
+
+    void OnButton(wxCommandEvent& event);
+    void OnClose(wxCloseEvent& event);
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+// A custom modal dialog
+class MyModalDialog : public wxDialog
+{
+public:
+    MyModalDialog(wxWindow *parent);
+
+    void OnButton(wxCommandEvent& event);
+
+private:
+    wxButton *m_btnModal,
+             *m_btnModeless,
+             *m_btnDelete;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // USE_MODAL_PRESENTATION
+

 // Define a new frame type
 class MyFrame: public wxFrame
 {
 public:
 // Define a new frame type
 class MyFrame: public wxFrame
 {
 public:

-    MyFrame(wxWindow *parent, const wxString& title,
-            const wxPoint& pos, const wxSize& size);
+    MyFrame(wxWindow *parent, const wxString& title);
+
+    void MessageBox(wxCommandEvent& event);

 
 

+#if wxUSE_COLOURDLG

     void ChooseColour(wxCommandEvent& event);
     void ChooseColour(wxCommandEvent& event);

+#endif // wxUSE_COLOURDLG
+
+#if wxUSE_FONTDLG

     void ChooseFont(wxCommandEvent& event);
     void ChooseFont(wxCommandEvent& event);

-    void MessageBox(wxCommandEvent& event);
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_LOG_DIALOG
+    void LogDialog(wxCommandEvent& event);
+#endif // wxUSE_LOG_DIALOG
+
+#if wxUSE_CHOICEDLG

     void SingleChoice(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);

+    void MultiChoice(wxCommandEvent& event);
+#endif // wxUSE_CHOICEDLG
+
+#if wxUSE_TEXTDLG

     void TextEntry(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);

+    void PasswordEntry(wxCommandEvent& event);
+#endif // wxUSE_TEXTDLG
+
+#if wxUSE_NUMBERDLG

     void NumericEntry(wxCommandEvent& event);
     void NumericEntry(wxCommandEvent& event);

+#endif // wxUSE_NUMBERDLG
+
+#if wxUSE_FILEDLG

     void FileOpen(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);

+    void FileOpen2(wxCommandEvent& event);
+    void FilesOpen(wxCommandEvent& event);

     void FileSave(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);

+#endif // wxUSE_FILEDLG
+
+#if USE_FILEDLG_GENERIC
+    void FileOpenGeneric(wxCommandEvent& event);
+    void FilesOpenGeneric(wxCommandEvent& event);
+    void FileSaveGeneric(wxCommandEvent& event);
+#endif // USE_FILEDLG_GENERIC
+
+#if wxUSE_DIRDLG

     void DirChoose(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);

+    void DirChooseNew(wxCommandEvent& event);
+#endif // wxUSE_DIRDLG
+
+#if USE_DIRDLG_GENERIC
+    void GenericDirChoose(wxCommandEvent& event);
+#endif // USE_DIRDLG_GENERIC
+
+#if wxUSE_STARTUP_TIPS

     void ShowTip(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);

-    void ExtDialog(wxCommandEvent &event);
+#endif // wxUSE_STARTUP_TIPS
+
+#if USE_MODAL_PRESENTATION
+    void ModalDlg(wxCommandEvent& event);
+    void ModelessDlg(wxCommandEvent& event);
+#endif // USE_MODAL_PRESENTATION
+
+#if wxUSE_PROGRESSDLG
+    void ShowProgress(wxCommandEvent& event);
+#endif // wxUSE_PROGRESSDLG
+
+#if wxUSE_BUSYINFO
+    void ShowBusyInfo(wxCommandEvent& event);
+#endif // wxUSE_BUSYINFO

 
 

-#if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
+#if wxUSE_FINDREPLDLG
+    void ShowFindDialog(wxCommandEvent& event);
+    void ShowReplaceDialog(wxCommandEvent& event);
+    void OnFindDialog(wxFindDialogEvent& event);
+#endif // wxUSE_FINDREPLDLG
+
+#if USE_COLOURDLG_GENERIC

     void ChooseColourGeneric(wxCommandEvent& event);
     void ChooseColourGeneric(wxCommandEvent& event);

+#endif // USE_COLOURDLG_GENERIC
+
+#if USE_FONTDLG_GENERIC

     void ChooseFontGeneric(wxCommandEvent& event);
     void ChooseFontGeneric(wxCommandEvent& event);

-#endif
+#endif // USE_FONTDLG_GENERIC

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

-  DECLARE_EVENT_TABLE()
+private:
+#if wxUSE_DIRDLG
+    void DoDirChoose(int style);
+#endif // wxUSE_DIRDLG
+
+#if USE_MODAL_PRESENTATION
+    MyModelessDialog *m_dialog;
+#endif // USE_MODAL_PRESENTATION
+
+#if wxUSE_FINDREPLDLG
+    wxFindReplaceData m_findData;
+
+    wxFindReplaceDialog *m_dlgFind,
+                        *m_dlgReplace;
+#endif // wxUSE_FINDREPLDLG
+
+    wxColourData m_clrData;
+
+    DECLARE_EVENT_TABLE()

 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent) { }
+    MyCanvas(wxWindow *parent) : 
+       wxScrolledWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }

 
     void OnPaint(wxPaintEvent& event);
 
 
     void OnPaint(wxPaintEvent& event);
 


@@ -63,19 +246,38 @@ public:
 
 
 // Menu IDs
 
 
 // Menu IDs

-#define DIALOGS_CHOOSE_COLOUR               1
-#define DIALOGS_CHOOSE_COLOUR_GENERIC       2
-#define DIALOGS_CHOOSE_FONT                 3
-#define DIALOGS_CHOOSE_FONT_GENERIC         4
-#define DIALOGS_MESSAGE_BOX                 5
-#define DIALOGS_SINGLE_CHOICE               6
-#define DIALOGS_TEXT_ENTRY                  7
-#define DIALOGS_FILE_OPEN                   8
-#define DIALOGS_FILE_SAVE                   9
-#define DIALOGS_DIR_CHOOSE                  10
-#define DIALOGS_TIP                         11
-#define DIALOGS_EXT_DIALOG                  12
-#define DIALOGS_NUM_ENTRY                   13
+enum
+{
+    DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,
+    DIALOGS_CHOOSE_COLOUR_GENERIC,
+    DIALOGS_CHOOSE_FONT,
+    DIALOGS_CHOOSE_FONT_GENERIC,
+    DIALOGS_MESSAGE_BOX,
+    DIALOGS_SINGLE_CHOICE,
+    DIALOGS_MULTI_CHOICE,
+    DIALOGS_TEXT_ENTRY,
+    DIALOGS_PASSWORD_ENTRY,
+    DIALOGS_FILE_OPEN,
+    DIALOGS_FILE_OPEN2,
+    DIALOGS_FILES_OPEN,
+    DIALOGS_FILE_SAVE,
+    DIALOGS_FILE_OPEN_GENERIC,
+    DIALOGS_FILES_OPEN_GENERIC,
+    DIALOGS_FILE_SAVE_GENERIC,
+    DIALOGS_DIR_CHOOSE,
+    DIALOGS_DIRNEW_CHOOSE,
+    DIALOGS_GENERIC_DIR_CHOOSE,
+    DIALOGS_TIP,
+    DIALOGS_NUM_ENTRY,
+    DIALOGS_LOG_DIALOG,
+    DIALOGS_MODAL,
+    DIALOGS_MODELESS,
+    DIALOGS_MODELESS_BTN,
+    DIALOGS_PROGRESS,
+    DIALOGS_BUSYINFO,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE
+};

 
 #endif
 
 
 #endif