X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/783e0c6d48080587b9d2c52dfe4d442682119a0d..30dfb744887db030ee38663bd206df49cde64990:/include/wx/motif/dialog.h?ds=sidebyside diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index dba81d148b..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: @@ -12,10 +12,6 @@ #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 @@ -26,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, @@ -55,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); @@ -79,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, @@ -99,6 +94,7 @@ protected: virtual void DoSetClientSize(int width, int height); + private: DECLARE_EVENT_TABLE() };