Latex corrections from Marc Albrecht

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 3193e26f2f5320aee9d8041f20d5ecd019b177d7..91bef905f17625f709dfbde6b7675017c9b62cc0 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -2,16 +2,48 @@
 // 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__
 

+#define USE_COLOURDLG_GENERIC                                                     \
+    (                                                                             \
+        wxUSE_COLOURDLG &&                                                        \
+        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+
+#define USE_DIRDLG_GENERIC                                                        \
+    (                                                                             \
+        wxUSE_DIRDLG &&                                                           \
+        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+#define USE_FILEDLG_GENERIC                                                       \
+    (                                                                             \
+        wxUSE_FILEDLG &&                                                          \
+        ( defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__) ) &&      \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+#define USE_FONTDLG_GENERIC                                                       \
+    (                                                                             \
+        wxUSE_FONTDLG &&                                                          \
+        ( defined(__WXMSW__) || defined(__WXPM__) ) &&                            \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+
+#define USE_MODAL_PRESENTATION   1
+

 // Define a new application type
 class MyApp: public wxApp
 {
 // Define a new application type
 class MyApp: public wxApp
 {


@@ -44,8 +76,9 @@ public:
     void OnButton(wxCommandEvent& event);
 
 private:
     void OnButton(wxCommandEvent& event);
 
 private:

-    wxButton *m_btnFocused;
-    wxButton *m_btnDelete;
+    wxButton *m_btnModal,
+             *m_btnModeless,
+             *m_btnDelete;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -54,49 +87,99 @@ private:
 class MyFrame: public wxFrame
 {
 public:
 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);

+#endif // wxUSE_FONTDLG
+
+#if wxUSE_LOG_DIALOG

     void LogDialog(wxCommandEvent& event);
     void LogDialog(wxCommandEvent& event);

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

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

+#endif // wxUSE_CHOICEDLG
+
+#if wxUSE_TEXTDLG

     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(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 FileOpen2(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);
     void FileOpen2(wxCommandEvent& event);
     void FilesOpen(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);
     void GenericDirChoose(wxCommandEvent& event);

+#endif // USE_DIRDLG_GENERIC
+
+#if wxUSE_STARTUP_TIPS

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

+#endif // wxUSE_STARTUP_TIPS
+
+#if USE_MODAL_PRESENTATION

     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);

+#endif // USE_MODAL_PRESENTATION
+

 #if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG
 #if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG

+

 #if wxUSE_BUSYINFO
     void ShowBusyInfo(wxCommandEvent& event);
 #endif // wxUSE_BUSYINFO
 #if wxUSE_BUSYINFO
     void ShowBusyInfo(wxCommandEvent& event);
 #endif // wxUSE_BUSYINFO

+

 #if wxUSE_FINDREPLDLG
     void ShowFindDialog(wxCommandEvent& event);
     void ShowReplaceDialog(wxCommandEvent& event);
 #if wxUSE_FINDREPLDLG
     void ShowFindDialog(wxCommandEvent& event);
     void ShowReplaceDialog(wxCommandEvent& event);

-

     void OnFindDialog(wxFindDialogEvent& event);
 #endif // wxUSE_FINDREPLDLG
 
     void OnFindDialog(wxFindDialogEvent& event);
 #endif // wxUSE_FINDREPLDLG
 

-#if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
+#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);
 
 private:
 
     void OnExit(wxCommandEvent& event);
 
 private:

+#if wxUSE_DIRDLG
+    void DoDirChoose(int style);
+#endif // wxUSE_DIRDLG
+
+#if USE_MODAL_PRESENTATION

     MyModelessDialog *m_dialog;
     MyModelessDialog *m_dialog;

+#endif // USE_MODAL_PRESENTATION

 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;
 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;


@@ -105,13 +188,16 @@ private:
                         *m_dlgReplace;
 #endif // wxUSE_FINDREPLDLG
 
                         *m_dlgReplace;
 #endif // wxUSE_FINDREPLDLG
 

+    wxColourData m_clrData;
+

     DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
     DECLARE_EVENT_TABLE()
 };
 
 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);
 


@@ -122,7 +208,7 @@ public:
 // Menu IDs
 enum
 {
 // Menu IDs
 enum
 {

-    DIALOGS_CHOOSE_COLOUR = 1,
+    DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,

     DIALOGS_CHOOSE_COLOUR_GENERIC,
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_CHOOSE_COLOUR_GENERIC,
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,


@@ -135,7 +221,11 @@ enum
     DIALOGS_FILE_OPEN2,
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     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_DIR_CHOOSE,

+    DIALOGS_DIRNEW_CHOOSE,

     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,