X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b835535a92d6c281084c10e46d51029c1eb776d..cde23b64b5194f0d71cf16c85ea33d28419c815f:/include/wx/gtk/dialog.h diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index f440b8a6be..ef76a636a9 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -8,37 +8,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDIALOGH__ -#define __GTKDIALOGH__ +#ifndef _WX_GTKDIALOG_H_ +#define _WX_GTKDIALOG_H_ -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/panel.h" -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxDialog; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const wxChar *wxDialogNameStr; +class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop; //----------------------------------------------------------------------------- // 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 +33,24 @@ public: const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); - ~wxDialog(); + virtual ~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 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() + wxGUIEventLoop *m_modalLoop; + DECLARE_DYNAMIC_CLASS(wxDialog) }; -#endif // __GTKDIALOGH__ +#endif // _WX_GTKDIALOG_H_