X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e2dc7895b298774d54a6f9e73855c116dfd8851..0fe243db0c0447b69917eaa6d3a0e32743229638:/samples/dialogs/dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 0dd71405a5..52630093d1 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -98,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
@@ -195,10 +211,10 @@ private:
     struct BtnInfo
     {
         int flag;
-        wxString name;
+        const char *name;
     };
 
-    static BtnInfo ms_btnInfo[Btn_Max];
+    static const BtnInfo ms_btnInfo[Btn_Max];
 
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;
@@ -212,7 +228,7 @@ private:
                *m_chkCentre;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
+    wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog);
 };
 
 class TestDefaultActionDialog: public wxDialog
@@ -294,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);
@@ -432,6 +450,7 @@ enum
     DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
+    DIALOGS_REARRANGE,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,