add IsOk() to all classes having Ok() method (patch 1570985)

[wxWidgets.git] / include / wx / mac / carbon / dialog.h

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index e6834011c5979fc6bf71b51d62d69016a9e6717f..5fa0912f67b5fdb501bf203224e661de0aff6896 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -12,15 +12,9 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dialog.h"
-#endif
-

 #include "wx/panel.h"
 
 #include "wx/panel.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];

 
 class WXDLLEXPORT wxMacToolTip ;
 
 
 class WXDLLEXPORT wxMacToolTip ;
 


@@ -30,7 +24,7 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:

-    wxDialog();
+    wxDialog() { Init(); }

 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,


@@ -39,9 +33,10 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
+        Init();
+        m_isModalStyle = modal;

         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),

-               style | modalStyle, name);
+               style, name);

     }
 
     // Constructor with no modal flag - the new convention.
     }
 
     // Constructor with no modal flag - the new convention.


@@ -52,6 +47,7 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

+        Init();

         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 


@@ -62,10 +58,10 @@ public:
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 

-    ~wxDialog();
+    virtual ~wxDialog();

 
 //    virtual bool Destroy();
 
 //    virtual bool Destroy();

-    bool Show(bool show = true);
+    virtual bool Show(bool show = true);

 
     void SetModal(bool flag);
     virtual bool IsModal() const;
 
     void SetModal(bool flag);
     virtual bool IsModal() const;


@@ -76,29 +72,22 @@ public:
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 

+    // mac also takes command-period as cancel
+    virtual bool IsEscapeKey(const wxKeyEvent& event);
+

     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
     // implementation
     // --------------
 
     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
     // implementation
     // --------------
 

-    // event handlers
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-

     // show modal dialog and enter modal loop
     void DoShowModal();
 
 private:
     // show modal dialog and enter modal loop
     void DoShowModal();
 
 private:

-    DECLARE_EVENT_TABLE()
+    void Init();
+
+    bool m_isModalStyle;

 };
 
 #endif
 };
 
 #endif