X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de8113d9a3b19159fe06e1f3321c799085c8d47d..2d14a14c573db4b8f8959b1460a269cf23defbcf:/include/wx/gtk/dialog.h?ds=sidebyside diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 0c7ea69240..5023f7db67 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -11,96 +11,46 @@ #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/panel.h" -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxDialog; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxDialogNameStr; +class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -class wxDialog: public wxPanel +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - public: - wxDialog(); - wxDialog( wxWindow *parent, wxWindowID id, + wxDialog() { Init(); } + wxDialog( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - ~wxDialog(); - - void SetTitle(const wxString& title); - wxString GetTitle() const; - - 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 void SetSize( int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO ); - virtual void SetSize( int width, int height ); - - virtual bool Show( bool show ); - virtual int ShowModal(); - virtual void EndModal( int retCode ); - virtual bool IsModal() const; - void SetModal( bool modal ); - - virtual void InitDialog(void); - - virtual void Centre( int direction = wxHORIZONTAL ); - - 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() { } + bool Create( wxWindow *parent, wxWindowID id, + const wxString &title, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + long style = wxDEFAULT_DIALOG_STYLE, + const wxString &name = wxDialogNameStr ); + virtual ~wxDialog(); -// implementation + virtual bool Show( bool show = TRUE ); + virtual int ShowModal(); + virtual void EndModal( int retCode ); + virtual bool IsModal() const; + void SetModal( bool modal ); - virtual void GtkOnSize( int x, int y, int width, int height ); - virtual void OnInternalIdle(); + // implementation + // -------------- - bool m_modalShowing; - wxString m_title; - wxIcon m_icon; + bool m_modalShowing; - DECLARE_EVENT_TABLE() +private: + // common part of all ctors + void Init(); + wxGUIEventLoop *m_modalLoop; + DECLARE_DYNAMIC_CLASS(wxDialog) }; #endif // __GTKDIALOGH__