don't test for hash_{map,set} classes if we have unordered_map

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 62ff683de9c16048b7420425b4b53f183efaa063..36836f1d3ad744d799529ae21c5ed4a1598ae919 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -77,7 +77,8 @@ of MSW, MAC and OS2
 #define USE_DIRDLG_GENERIC \
     ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
 #define USE_FILEDLG_GENERIC \
-    ((((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)
+    ((((USE_WXMSW || USE_WXMAC || USE_WXPM || USE_WXGTK) \
+                    && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)
 #define USE_FONTDLG_GENERIC \
     ((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
 
@@ -169,6 +170,22 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+class TestDefaultActionDialog: public wxDialog
+{
+public:
+    TestDefaultActionDialog( wxWindow *parent );
+    
+    void OnListBoxDClick(wxCommandEvent& event);
+    void OnCatchListBoxDClick(wxCommandEvent& event);
+    
+private:
+    bool   m_catchListBoxDClick;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+
 #if USE_SETTINGS_DIALOG
 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
@@ -206,11 +223,16 @@ class MyFrame: public wxFrame
 {
 public:
     MyFrame(wxWindow *parent, const wxString& title);
+    virtual ~MyFrame();
 
+#if wxUSE_MSGDLG
     void MessageBox(wxCommandEvent& event);
+    void MessageBoxInfo(wxCommandEvent& event);
+#endif // wxUSE_MSGDLG
 
 #if wxUSE_COLOURDLG
     void ChooseColour(wxCommandEvent& event);
+    void GetColour(wxCommandEvent& event);
 #endif // wxUSE_COLOURDLG
 
 #if wxUSE_FONTDLG
@@ -300,8 +322,18 @@ public:
 #endif // USE_FONTDLG_GENERIC
 
     void OnPropertySheet(wxCommandEvent& event);
+
     void OnRequestUserAttention(wxCommandEvent& event);
+#if wxUSE_NOTIFICATION_MESSAGE
+    void OnNotifMsgAuto(wxCommandEvent& event);
+    void OnNotifMsgShow(wxCommandEvent& event);
+    void OnNotifMsgHide(wxCommandEvent& event);
+#endif // wxUSE_NOTIFICATION_MESSAGE
+
     void OnStandardButtonsSizerDialog(wxCommandEvent& event);
+    
+    void OnTestDefaultActionDialog(wxCommandEvent& event);
+    
     void OnExit(wxCommandEvent& event);
 
 private:
@@ -320,6 +352,10 @@ private:
                         *m_dlgReplace;
 #endif // wxUSE_FINDREPLDLG
 
+#if wxUSE_NOTIFICATION_MESSAGE
+    wxNotificationMessage *m_notifMsg;
+#endif // wxUSE_NOTIFICATION_MESSAGE
+
     wxColourData m_clrData;
 
     DECLARE_EVENT_TABLE()
@@ -341,10 +377,12 @@ public:
 enum
 {
     DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,
+    DIALOGS_GET_COLOUR,
     DIALOGS_CHOOSE_COLOUR_GENERIC,
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
+    DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
     DIALOGS_TEXT_ENTRY,
@@ -378,10 +416,14 @@ enum
     DIALOGS_FIND,
     DIALOGS_REPLACE,
     DIALOGS_REQUEST,
+    DIALOGS_NOTIFY_AUTO,
+    DIALOGS_NOTIFY_SHOW,
+    DIALOGS_NOTIFY_HIDE,
     DIALOGS_PROPERTY_SHEET,
     DIALOGS_PROPERTY_SHEET_TOOLBOOK,
     DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK,
-    DIALOGS_STANDARD_BUTTON_SIZER_DIALOG
+    DIALOGS_STANDARD_BUTTON_SIZER_DIALOG,
+    DIALOGS_TEST_DEFAULT_ACTION
 };
 
 #endif