X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e152afc3d45b72468b14ba15ab6badc19c735a70:/include/wx/motif/dialog.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index f2fff31b0d..9fa1cfd9c1 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -6,16 +6,12 @@ // 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; // Dialog boxes @@ -38,7 +34,7 @@ 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, @@ -48,7 +44,7 @@ public: virtual bool Destroy(); - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); void SetTitle(const wxString& title); @@ -61,7 +57,7 @@ public: 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; } @@ -79,13 +75,14 @@ public: void OnCloseWindow(wxCloseEvent& event); 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; @@ -98,6 +95,7 @@ protected: virtual void DoSetClientSize(int width, int height); + private: DECLARE_EVENT_TABLE() };