X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..1a33ac8fb0f5e43c89bd698618d554c6f7b8b452:/include/wx/mac/dialog.h?ds=sidebyside diff --git a/include/wx/mac/dialog.h b/include/wx/mac/dialog.h index 3eedf8586f..e6834011c5 100644 --- a/include/wx/mac/dialog.h +++ b/include/wx/mac/dialog.h @@ -6,19 +6,19 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialog.h" #endif #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; @@ -65,7 +65,7 @@ public: ~wxDialog(); // virtual bool Destroy(); - bool Show(bool show); + bool Show(bool show = true); void SetModal(bool flag); virtual bool IsModal() const; @@ -79,10 +79,6 @@ public: // returns TRUE if we're in a modal loop bool IsModalShowing() const; -#if WXWIN_COMPATIBILITY - bool Iconized() const { return IsIconized(); }; -#endif - // implementation // --------------