Use template class instead of template function in wxVectorSort().

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 19605e1a2c7189b57491c85bea6a28251e4e244e..dde63a4e310b70db6e42a00893bd72e351baee5a 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

+//              (c) 2004 ABX
+//              (c) Vadim Zeitlin

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -116,9 +117,6 @@ class MyApp: public wxApp
 public:
     virtual bool OnInit();
 
 public:
     virtual bool OnInit();
 

-    wxFont       m_canvasFont;
-    wxColour     m_canvasTextColour;
-

 protected:
 #if wxUSE_LOG
     virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }
 protected:
 #if wxUSE_LOG
     virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }


@@ -216,6 +214,17 @@ private:
 
     static const BtnInfo ms_btnInfo[Btn_Max];
 
 
     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;
 
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;
 


@@ -228,7 +237,7 @@ private:
                *m_chkCentre;
 
     DECLARE_EVENT_TABLE()
                *m_chkCentre;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
+    wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog);

 };
 
 class TestDefaultActionDialog: public wxDialog
 };
 
 class TestDefaultActionDialog: public wxDialog


@@ -283,13 +292,15 @@ DECLARE_EVENT_TABLE()
 class MyFrame: public wxFrame
 {
 public:
 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);
     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
 #endif // wxUSE_MSGDLG
 
 #if wxUSE_COLOURDLG


@@ -305,6 +316,11 @@ public:
     void LogDialog(wxCommandEvent& event);
 #endif // wxUSE_LOG_DIALOG
 
     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);
 #if wxUSE_CHOICEDLG
     void SingleChoice(wxCommandEvent& event);
     void MultiChoice(wxCommandEvent& event);


@@ -422,15 +438,30 @@ private:
 
     wxColourData m_clrData;
 
 
     wxColourData m_clrData;
 

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

-    MyCanvas(wxWindow *parent) :
-       wxScrolledWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }
+    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent, wxID_ANY)
+    {
+        SetForegroundColour(*wxBLACK);
+        SetBackgroundColour(*wxWHITE);
+        SetFont(*wxNORMAL_FONT);
+    }

 
 

+private:

     void OnPaint(wxPaintEvent& event);
 
     DECLARE_EVENT_TABLE()
     void OnPaint(wxPaintEvent& event);
 
     DECLARE_EVENT_TABLE()


@@ -446,6 +477,7 @@ enum
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
     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,
     DIALOGS_MESSAGE_DIALOG,
     DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,


@@ -466,6 +498,8 @@ enum
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,

+    DIALOGS_INFOBAR_SIMPLE,
+    DIALOGS_INFOBAR_ADVANCED,

     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_CENTRE_SCREEN,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_CENTRE_SCREEN,