replace wrong WXDLLEXPORT declarations with correct WXDLLIMPEXP_BASE/ADV/GL (patch...

[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 c1e0c03e45f1d39fa1584bd77767c70e68fc67a1..4b3827bea0221fec586d1644cab67db7910ad002 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -14,9 +14,9 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

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

 
 

-class WXDLLEXPORT wxMacToolTip ;
+class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;

 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase


@@ -26,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
 public:
     wxDialog() { Init(); }
 
 public:
     wxDialog() { Init(); }
 

-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-             const wxString& title, bool modal,
-             int x = -1, int y= -1, int width = 500, int height = 500,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-        m_isModalStyle = modal;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
-               style, name);
-    }
-

     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,


@@ -58,7 +45,7 @@ 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 Show(bool show = true);
 
 //    virtual bool Destroy();
     virtual bool Show(bool show = true);


@@ -72,31 +59,20 @@ 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);
 

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

     // implementation
     // --------------
 
     // 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();
 
     // show modal dialog and enter modal loop
     void DoShowModal();
 

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

 private:
     void Init();
 private:
     void Init();

+

     bool m_isModalStyle;
     bool m_isModalStyle;

-    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif