X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a625c5b6c0d1c0f137bfbbdd98608c194017da75..02cecc4dc2c07b3e4b109edf44c4c87a2fed87d9:/samples/dialogs/dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index b59b323ce2..19605e1a2c 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -77,7 +77,8 @@ of MSW, MAC and OS2
 #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) || USE_WXWINCE) && wxUSE_FILEDLG)
+    ((((USE_WXMSW || USE_WXMAC || USE_WXPM || USE_WXGTK) \
+                    && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)
 #define USE_FONTDLG_GENERIC \
     ((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
 
@@ -97,15 +98,31 @@ of MSW, MAC and OS2
     #define USE_SETTINGS_DIALOG 0
 #endif
 
+#if wxUSE_LOG
+
+// Custom application traits class which we use to override the default log
+// target creation
+class MyAppTraits : public wxGUIAppTraits
+{
+public:
+    virtual wxLog *CreateLogTarget();
+};
+
+#endif // wxUSE_LOG
 
 // Define a new application type
 class MyApp: public wxApp
 {
 public:
-    bool OnInit();
+    virtual bool OnInit();
 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;
+
+protected:
+#if wxUSE_LOG
+    virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }
+#endif // wxUSE_LOG
 };
 
 #if USE_MODAL_PRESENTATION
@@ -141,6 +158,7 @@ private:
 
 #endif // USE_MODAL_PRESENTATION
 
+// A class demonstrating CreateStdDialogButtonSizer()
 class StdButtonSizerDialog : public wxDialog
 {
 public:
@@ -169,14 +187,58 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+// Test harness for wxMessageDialog.
+class TestMessageBoxDialog : public wxDialog
+{
+public:
+    TestMessageBoxDialog(wxWindow *parent);
+
+private:
+    void OnApply(wxCommandEvent& event);
+    void OnClose(wxCommandEvent& event);
+    void OnUpdateLabelUI(wxUpdateUIEvent& event);
+    void OnUpdateNoDefaultUI(wxUpdateUIEvent& event);
+
+    enum
+    {
+        Btn_Yes,
+        Btn_No,
+        Btn_Ok,
+        Btn_Cancel,
+        Btn_Max
+    };
+
+    struct BtnInfo
+    {
+        int flag;
+        const char *name;
+    };
+
+    static const BtnInfo ms_btnInfo[Btn_Max];
+
+    wxTextCtrl *m_textMsg,
+               *m_textExtMsg;
+
+    wxCheckBox *m_buttons[Btn_Max];
+    wxTextCtrl *m_labels[Btn_Max];
+
+    wxRadioBox *m_icons;
+
+    wxCheckBox *m_chkNoDefault,
+               *m_chkCentre;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
+};
+
 class TestDefaultActionDialog: public wxDialog
 {
 public:
     TestDefaultActionDialog( wxWindow *parent );
-    
+
     void OnListBoxDClick(wxCommandEvent& event);
     void OnCatchListBoxDClick(wxCommandEvent& event);
-    
+
 private:
     bool   m_catchListBoxDClick;
 
@@ -226,6 +288,7 @@ public:
 
 #if wxUSE_MSGDLG
     void MessageBox(wxCommandEvent& event);
+    void MessageBoxDialog(wxCommandEvent& event);
     void MessageBoxInfo(wxCommandEvent& event);
 #endif // wxUSE_MSGDLG
 
@@ -247,6 +310,8 @@ public:
     void MultiChoice(wxCommandEvent& event);
 #endif // wxUSE_CHOICEDLG
 
+    void Rearrange(wxCommandEvent& event);
+
 #if wxUSE_TEXTDLG
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
@@ -330,9 +395,9 @@ public:
 #endif // wxUSE_NOTIFICATION_MESSAGE
 
     void OnStandardButtonsSizerDialog(wxCommandEvent& event);
-    
+
     void OnTestDefaultActionDialog(wxCommandEvent& event);
-    
+
     void OnExit(wxCommandEvent& event);
 
 private:
@@ -381,9 +446,11 @@ enum
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
+    DIALOGS_MESSAGE_DIALOG,
     DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
+    DIALOGS_REARRANGE,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,