Fixed incorrect background colour that wxStaticTexts in description box sometimes got

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 481794688f9aa78af410e8372f7f89c457ebca12..ad8956acfb7041c8e5f0a6cc9411e146194790fa 100644 (file)
--- 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
@@ -181,6 +197,7 @@ private:
     void OnApply(wxCommandEvent& event);
     void OnClose(wxCommandEvent& event);
     void OnUpdateLabelUI(wxUpdateUIEvent& event);
+    void OnUpdateNoDefaultUI(wxUpdateUIEvent& event);
 
     enum
     {
@@ -194,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;
@@ -207,6 +224,9 @@ private:
 
     wxRadioBox *m_icons;
 
+    wxCheckBox *m_chkNoDefault,
+               *m_chkCentre;
+
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
 };