X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e30285abc6cb45d7e2cd66ddfe3eb460821f57ae..22d080f35b173d2a855078d11e6b142b4e6d79a7:/include/wx/motif/dialog.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index c8d36d63fa..1f10207ba8 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -12,11 +12,11 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialog.h" #endif -WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; +class WXDLLEXPORT wxEventLoop; // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase @@ -26,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase public: wxDialog(); -#if WXWIN_COMPATIBILITY_2 - // Constructor with a modal flag, but no window id - the old convention - wxDialog(wxWindow *parent, - const wxString& title, bool modal, - int x = -1, int y= -1, int width = 500, int height = 500, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; - Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name); - } -#endif - // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, @@ -102,6 +89,7 @@ private: //// Motif-specific bool m_modalShowing; + wxEventLoop* m_eventLoop; protected: virtual void DoSetSize(int x, int y,