X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..edb8f2985fc838f92c60d9efd42462441f3caea9:/include/wx/gtk1/dialog.h?ds=sidebyside diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h index 44f11d3fdf..79be8d8009 100644 --- a/include/wx/gtk1/dialog.h +++ b/include/wx/gtk1/dialog.h @@ -2,13 +2,12 @@ // Name: dialog.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Created: +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKDIALOGH__ #define __GTKDIALOGH__ @@ -17,16 +16,6 @@ #endif #include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/event.h" -#include "wx/window.h" - -//----------------------------------------------------------------------------- -// forward decls -//----------------------------------------------------------------------------- - -class wxRadioBox; //----------------------------------------------------------------------------- // classes @@ -38,58 +27,57 @@ class wxDialog; // global data //----------------------------------------------------------------------------- -extern const char *wxDialogNameStr; +extern const wxChar *wxDialogNameStr; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -class wxDialog: public wxWindow +class wxDialog: public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - - public: - - 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); +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 ); + ~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 bool Show( bool show ); - virtual int ShowModal(void); - virtual void EndModal(int retCode); - virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } - virtual void InitDialog(void); -/* - void OnOK(wxCommandEvent& event); - void OnApply(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); -*/ - - private: - - friend wxWindow; - friend wxDC; - friend wxRadioBox; + void OnOK( wxCommandEvent &event ); + 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 ); + + // implementation + // -------------- + bool m_modalShowing; - wxString m_title; - - DECLARE_EVENT_TABLE() - + +protected: + // common part of all ctors + void Init(); + +private: + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxDialog) }; #endif // __GTKDIALOGH__