fix virtual function hiding warnings introduced to changing wxSockAddress argument...

[wxWidgets.git] / include / wx / cocoa / dialog.h

diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h
index f0a8f6dda24b820a6a68f66960eeb2110964dcb1..9bf499f76601d59633822c5a0e4a7b061bb8aadf 100644 (file)
--- a/include/wx/cocoa/dialog.h
+++ b/include/wx/cocoa/dialog.h
@@ -17,15 +17,12 @@
 #include "wx/panel.h"
 #include "wx/cocoa/NSPanel.h"
 
 #include "wx/panel.h"
 #include "wx/cocoa/NSPanel.h"
 

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

 // ========================================================================
 // wxDialog
 // ========================================================================
 // ========================================================================
 // wxDialog
 // ========================================================================

-class WXDLLEXPORT wxDialog : public wxDialogBase, protected wxCocoaNSPanel
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase, protected wxCocoaNSPanel

 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)

-    DECLARE_EVENT_TABLE()

     WX_DECLARE_COCOA_OWNER(NSPanel,NSWindow,NSWindow)
 // ------------------------------------------------------------------------
 // initialization
     WX_DECLARE_COCOA_OWNER(NSPanel,NSWindow,NSWindow)
 // ------------------------------------------------------------------------
 // initialization


@@ -66,7 +63,7 @@ public:
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 

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

 protected:
     void Init();
 
 protected:
     void Init();
 


@@ -93,20 +90,6 @@ 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);

-
-// ------------------------------------------------------------------------
-// Event handlers
-// ------------------------------------------------------------------------
-protected:
-    void OnCloseWindow(wxCloseEvent& event);
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // end either modal or modeless dialog
-    void EndDialog(int rc);
-

 };
 
 #endif // _WX_COCOA_DIALOG_H_
 };
 
 #endif // _WX_COCOA_DIALOG_H_