X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87a1867991ec94e6a86557af9971cf53365b9c36..79d81c45ca3e1b6c6d0c8712986e0b3ab42ad28f:/samples/dialogs/dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 90b46574a2..dde63a4e31 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo
-// Author:      Julian Smart
-// Modified by: ABX (2004) - adjustementd for conditional building
+// Author:      Julian Smart, Vadim Zeitlin, ABX
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
+//              (c) 2004 ABX
+//              (c) Vadim Zeitlin
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -116,9 +117,6 @@ class MyApp: public wxApp
 public:
     virtual bool OnInit();
 
-    wxFont       m_canvasFont;
-    wxColour     m_canvasTextColour;
-
 protected:
 #if wxUSE_LOG
     virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }
@@ -216,6 +214,17 @@ private:
 
     static const BtnInfo ms_btnInfo[Btn_Max];
 
+    enum
+    {
+        MsgDlgIcon_No,
+        MsgDlgIcon_None,
+        MsgDlgIcon_Info,
+        MsgDlgIcon_Question,
+        MsgDlgIcon_Warning,
+        MsgDlgIcon_Error,
+        MsgDlgIcon_Max
+    };
+
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;
 
@@ -283,13 +292,15 @@ DECLARE_EVENT_TABLE()
 class MyFrame: public wxFrame
 {
 public:
-    MyFrame(wxWindow *parent, const wxString& title);
+    MyFrame(const wxString& title);
     virtual ~MyFrame();
 
 #if wxUSE_MSGDLG
     void MessageBox(wxCommandEvent& event);
     void MessageBoxDialog(wxCommandEvent& event);
     void MessageBoxInfo(wxCommandEvent& event);
+    void MessageBoxWindowModal(wxCommandEvent& event);
+    void MessageBoxWindowModalClosed(wxWindowModalDialogEvent& event);
 #endif // wxUSE_MSGDLG
 
 #if wxUSE_COLOURDLG
@@ -305,6 +316,11 @@ public:
     void LogDialog(wxCommandEvent& event);
 #endif // wxUSE_LOG_DIALOG
 
+#if wxUSE_INFOBAR
+    void InfoBarSimple(wxCommandEvent& event);
+    void InfoBarAdvanced(wxCommandEvent& event);
+#endif // wxUSE_INFOBAR
+
 #if wxUSE_CHOICEDLG
     void SingleChoice(wxCommandEvent& event);
     void MultiChoice(wxCommandEvent& event);
@@ -425,6 +441,13 @@ private:
     // just a window which we use to show the effect of font/colours selection
     wxWindow *m_canvas;
 
+#if wxUSE_INFOBAR
+    void OnInfoBarRedo(wxCommandEvent& event);
+
+    wxInfoBar *m_infoBarSimple,
+              *m_infoBarAdvanced;
+#endif // wxUSE_INFOBAR
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -433,7 +456,9 @@ class MyCanvas: public wxScrolledWindow
 public:
     MyCanvas(wxWindow *parent) : wxScrolledWindow(parent, wxID_ANY)
     {
+        SetForegroundColour(*wxBLACK);
         SetBackgroundColour(*wxWHITE);
+        SetFont(*wxNORMAL_FONT);
     }
 
 private:
@@ -452,6 +477,7 @@ enum
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
+    DIALOGS_MESSAGE_BOX_WINDOW_MODAL,
     DIALOGS_MESSAGE_DIALOG,
     DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,
@@ -472,6 +498,8 @@ enum
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,
+    DIALOGS_INFOBAR_SIMPLE,
+    DIALOGS_INFOBAR_ADVANCED,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_CENTRE_SCREEN,