X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..6d99eb3e379fc5cdb835f9a87f92b612ec58dd1c:/include/wx/gtk/dialog.h?ds=inline diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 099dd51d74..0269e17a23 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -11,10 +11,6 @@ #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" //----------------------------------------------------------------------------- @@ -27,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr; +extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[]; //----------------------------------------------------------------------------- // wxDialog @@ -49,16 +45,7 @@ public: 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(); @@ -71,12 +58,10 @@ public: bool m_modalShowing; -protected: +private: // common part of all ctors void Init(); -private: - DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxDialog) };