X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b835535a92d6c281084c10e46d51029c1eb776d..fb52c2b67139da20b026475aa48d73522e6afe2b:/include/wx/gtk/dialog.h diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index f440b8a6be..0269e17a23 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -11,34 +11,26 @@ #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/defs.h" -#include "wx/panel.h" -#include "wx/icon.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxDialog; +class WXDLLIMPEXP_CORE wxDialog; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxDialogNameStr; +extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[]; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -class wxDialog: public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - public: wxDialog() { Init(); } wxDialog( wxWindow *parent, wxWindowID id, @@ -53,57 +45,24 @@ public: const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); - ~wxDialog(); - - void SetTitle(const wxString& title); - wxString GetTitle() const; + virtual ~wxDialog() {} - void OnApply( wxCommandEvent &event ); - void OnCancel( wxCommandEvent &event ); - void OnOK( wxCommandEvent &event ); - void OnPaint( wxPaintEvent& event ); - void OnSize( wxSizeEvent &event ); - void OnCloseWindow( wxCloseEvent& event ); - /* - void OnCharHook( wxKeyEvent& event ); - */ - - bool Destroy(); - - virtual bool Show( bool show ); + virtual bool Show( bool show = TRUE ); virtual int ShowModal(); virtual void EndModal( int retCode ); virtual bool IsModal() const; void SetModal( bool modal ); - virtual void InitDialog(void); - - virtual void SetIcon( const wxIcon &icon ); - virtual void Iconize( bool WXUNUSED(iconize)) { } - virtual bool IsIconized() const { return FALSE; } - bool Iconized() const { return IsIconized(); } - virtual void Maximize() { } - virtual void Restore() { } - // implementation - - virtual void GtkOnSize( int x, int y, int width, int height ); - virtual void OnInternalIdle(); + // -------------- bool m_modalShowing; - wxString m_title; - wxIcon m_icon; -protected: +private: // common part of all ctors void Init(); - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - -private: - DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxDialog) }; #endif // __GTKDIALOGH__