X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..d95c5149add596d0dec940599332a24edf96dc38:/include/wx/motif/dialog.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index 3c8866fb1d..be53d02123 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/motif/dialog.h // Purpose: wxDialog class // Author: Julian Smart // Modified by: @@ -22,7 +22,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase public: wxDialog(); - // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -51,7 +50,7 @@ public: 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); @@ -75,7 +74,7 @@ public: void OnCloseWindow(wxCloseEvent& event); private: - virtual bool DoCreate(wxWindow* parent, + virtual bool XmDoCreateTLW(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -95,11 +94,6 @@ protected: virtual void DoSetClientSize(int width, int height); -#if wxCHECK_VERSION(2,7,0) - #error "Remove DoDestroy(), it was only kept for binary backwards compatibility" -#endif - - virtual void DoDestroy(); private: DECLARE_EVENT_TABLE()