make independent from carbon

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 9f30a1c8d8426a2295d9e2f2252008ef95dbd75d..b14cd1100717035ae10cc876ec67386caf1be868 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -11,29 +11,11 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxDialogNameStr;
-

 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 

-class wxDialog: public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase

 {
 public:
     wxDialog() { Init(); }
 {
 public:
     wxDialog() { Init(); }


@@ -49,16 +31,7 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );

-    ~wxDialog() {}
-
-    void OnApply( wxCommandEvent &event );
-    void OnCancel( wxCommandEvent &event );
-    void OnOK( wxCommandEvent &event );
-    void OnPaint( wxPaintEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
-    /*
-       void OnCharHook( wxKeyEvent& event );
-     */
+    virtual ~wxDialog();

 
     virtual bool Show( bool show = TRUE );
     virtual int ShowModal();
 
     virtual bool Show( bool show = TRUE );
     virtual int ShowModal();


@@ -71,12 +44,10 @@ public:
 
     bool       m_modalShowing;
 
 
     bool       m_modalShowing;
 

-protected:
+private:

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-private:
-    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };