X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c39058f631b3a53682f00807a60bfff6c5aa2b7c:/include/wx/motif/dialog.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index f2fff31b0d..a0a3247b9f 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -1,32 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/motif/dialog.h // Purpose: wxDialog class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "dialog.h" -#endif - -class WXDLLEXPORT wxEventLoop; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - public: wxDialog(); - // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -38,54 +31,44 @@ public: } bool Create(wxWindow *parent, wxWindowID id, - const wxString& title, // bool modal = FALSE, // TODO make this a window style? + const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); virtual bool Destroy(); - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); void SetTitle(const wxString& title); void SetModal(bool flag); virtual bool IsModal() const - { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } + { return m_modalShowing; } virtual int ShowModal(); virtual void EndModal(int retCode); // Implementation - virtual void ChangeFont(bool keepOriginalSize = TRUE); + virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); - inline WXWidget GetTopWidget() const { return m_mainWidget; } - inline WXWidget GetClientWidget() const { return m_mainWidget; } - - // Standard buttons - void OnOK(wxCommandEvent& event); - void OnApply(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - void OnCharHook(wxKeyEvent& event); - void OnCloseWindow(wxCloseEvent& event); + WXWidget GetTopWidget() const { return m_mainWidget; } + WXWidget GetClientWidget() const { return m_mainWidget; } private: - virtual bool DoCreate( wxWindow* parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ); - virtual void DoDestroy(); + virtual bool XmDoCreateTLW(wxWindow* parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name); + //// Motif-specific bool m_modalShowing; @@ -93,14 +76,14 @@ private: protected: virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + int width, int height, + int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); + private: - DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxDialog) }; -#endif -// _WX_DIALOG_H_ +#endif // _WX_DIALOG_H_