Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index d63cd1717b47eea6a5ff57014e81421833ff03a2..3d866d9a40133e28364b97f009096173e662600b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -115,12 +115,26 @@ public:
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

+    MyApp() { m_startupProgressStyle = -1; }
+

     virtual bool OnInit();
 
     virtual bool OnInit();
 

+#if wxUSE_CMDLINE_PARSER
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+#endif // wxUSE_CMDLINE_PARSER
+

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

+
+private:
+    // Flag set to a valid value if command line option "progress" is used,
+    // this allows testing of wxProgressDialog before the main event loop is
+    // started. If this option is not specified it is set to -1 by default
+    // meaning that progress dialog shouldn't be shown at all.
+    long m_startupProgressStyle;

 };
 
 #if USE_MODAL_PRESENTATION
 };
 
 #if USE_MODAL_PRESENTATION


@@ -194,6 +208,7 @@ public:
     bool Create();
 
 protected:
     bool Create();
 
 protected:

+    wxString GetBoxTitle() { return m_textTitle->GetValue(); }

     wxString GetMessage() { return m_textMsg->GetValue(); }
     long GetStyle();
 
     wxString GetMessage() { return m_textMsg->GetValue(); }
     long GetStyle();
 


@@ -214,6 +229,7 @@ private:
         Btn_No,
         Btn_Ok,
         Btn_Cancel,
         Btn_No,
         Btn_Ok,
         Btn_Cancel,

+        Btn_Help,

         Btn_Max
     };
 
         Btn_Max
     };
 


@@ -233,10 +249,12 @@ private:
         MsgDlgIcon_Question,
         MsgDlgIcon_Warning,
         MsgDlgIcon_Error,
         MsgDlgIcon_Question,
         MsgDlgIcon_Warning,
         MsgDlgIcon_Error,

+        MsgDlgIcon_AuthNeeded,

         MsgDlgIcon_Max
     };
 
         MsgDlgIcon_Max
     };
 

-    wxTextCtrl *m_textMsg,
+    wxTextCtrl *m_textTitle,
+               *m_textMsg,

                *m_textExtMsg;
 
     wxCheckBox *m_buttons[Btn_Max];
                *m_textExtMsg;
 
     wxCheckBox *m_buttons[Btn_Max];


@@ -279,7 +297,10 @@ public:
     TestDefaultActionDialog( wxWindow *parent );
 
     void OnListBoxDClick(wxCommandEvent& event);
     TestDefaultActionDialog( wxWindow *parent );
 
     void OnListBoxDClick(wxCommandEvent& event);

+    void OnDisableOK(wxCommandEvent& event);
+    void OnDisableCancel(wxCommandEvent& event);

     void OnCatchListBoxDClick(wxCommandEvent& event);
     void OnCatchListBoxDClick(wxCommandEvent& event);

+    void OnTextEnter(wxCommandEvent& event);

 
 private:
     bool   m_catchListBoxDClick;
 
 private:
     bool   m_catchListBoxDClick;


@@ -365,6 +386,7 @@ public:
     void Rearrange(wxCommandEvent& event);
 
 #if wxUSE_TEXTDLG
     void Rearrange(wxCommandEvent& event);
 
 #if wxUSE_TEXTDLG

+    void LineEntry(wxCommandEvent& event);

     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
 #endif // wxUSE_TEXTDLG
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
 #endif // wxUSE_TEXTDLG


@@ -446,9 +468,14 @@ public:
     void OnNotifMsgHide(wxCommandEvent& event);
 #endif // wxUSE_NOTIFICATION_MESSAGE
 
     void OnNotifMsgHide(wxCommandEvent& event);
 #endif // wxUSE_NOTIFICATION_MESSAGE
 

+#if wxUSE_RICHTOOLTIP
+    void OnRichTipDialog(wxCommandEvent& event);
+#endif // wxUSE_RICHTOOLTIP
+

     void OnStandardButtonsSizerDialog(wxCommandEvent& event);
 
     void OnTestDefaultActionDialog(wxCommandEvent& event);
     void OnStandardButtonsSizerDialog(wxCommandEvent& event);
 
     void OnTestDefaultActionDialog(wxCommandEvent& event);

+    void OnModalHook(wxCommandEvent& event);

 
     void OnExit(wxCommandEvent& event);
 
 
     void OnExit(wxCommandEvent& event);
 


@@ -520,6 +547,7 @@ enum
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
     DIALOGS_REARRANGE,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
     DIALOGS_REARRANGE,

+    DIALOGS_LINE_ENTRY,

     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,


@@ -556,11 +584,13 @@ enum
     DIALOGS_NOTIFY_AUTO,
     DIALOGS_NOTIFY_SHOW,
     DIALOGS_NOTIFY_HIDE,
     DIALOGS_NOTIFY_AUTO,
     DIALOGS_NOTIFY_SHOW,
     DIALOGS_NOTIFY_HIDE,

+    DIALOGS_RICHTIP_DIALOG,

     DIALOGS_PROPERTY_SHEET,
     DIALOGS_PROPERTY_SHEET_TOOLBOOK,
     DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK,
     DIALOGS_STANDARD_BUTTON_SIZER_DIALOG,
     DIALOGS_PROPERTY_SHEET,
     DIALOGS_PROPERTY_SHEET_TOOLBOOK,
     DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK,
     DIALOGS_STANDARD_BUTTON_SIZER_DIALOG,

-    DIALOGS_TEST_DEFAULT_ACTION
+    DIALOGS_TEST_DEFAULT_ACTION,
+    DIALOGS_MODAL_HOOK

 };
 
 #endif
 };
 
 #endif