X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/gtk1/dialog.h?ds=sidebyside diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h index f838cbf3be..fb78c8c440 100644 --- a/include/wx/gtk1/dialog.h +++ b/include/wx/gtk1/dialog.h @@ -1,102 +1,65 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/gtk1/dialog.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 +// Created: // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/panel.h" -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// forward decls -//----------------------------------------------------------------------------- - -class wxRadioBox; - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxDialog; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxDialogNameStr; - //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -class wxDialog: public wxPanel +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - - public: +public: + 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 ); + virtual ~wxDialog() {} - wxDialog(void); - 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); - void SetTitle(const wxString& title); - wxString GetTitle(void) const; - bool OnClose(void); void OnApply( wxCommandEvent &event ); void OnCancel( wxCommandEvent &event ); void OnOK( wxCommandEvent &event ); - void OnPaint(wxPaintEvent& event); - bool Destroy(void); - void OnCloseWindow(wxCloseEvent& event); -/* - void OnCharHook(wxKeyEvent& event); -*/ - virtual bool Show( bool show ); - virtual int ShowModal(void); - virtual void EndModal(int retCode); - virtual bool IsModal(void) const; + void OnPaint( wxPaintEvent& event ); + void OnCloseWindow( wxCloseEvent& event ); + /* + void OnCharHook( wxKeyEvent& event ); + */ + + 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 Centre( int direction = wxHORIZONTAL ); - - virtual void SetIcon( const wxIcon &icon ); - virtual void Iconize( bool WXUNUSED(iconize)) { } - virtual bool IsIconized(void) const { return FALSE; } - bool Iconized(void) const { return IsIconized(); } - virtual void Maximize(void) { } - virtual void Restore(void) { } - - private: - - friend wxWindow; - friend wxDC; - friend wxRadioBox; - + + // implementation + // -------------- + bool m_modalShowing; - wxString m_title; - wxIcon m_icon; - - virtual void ImplementSetPosition(); - - DECLARE_EVENT_TABLE() - + +protected: + // common part of all ctors + void Init(); + +private: + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxDialog) }; #endif // __GTKDIALOGH__