X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e1bcfa80e19ac853b8bc7084075fe3b01e63f03..6ca154fcc14a2532798a23977baee2eed3179d19:/include/wx/motif/dialog.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index 0e3b7980f6..861062d819 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -12,12 +12,10 @@ #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 @@ -28,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, @@ -53,7 +38,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, @@ -63,7 +48,7 @@ public: virtual bool Destroy(); - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); void SetTitle(const wxString& title); @@ -76,7 +61,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; }