X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d79bd3eaf6fe173996b9fc71693891a11dabd96..0e0d594d1abd1818f59ff7b16be828b16fe11d50:/include/wx/generic/choicdgg.h diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index c1f264b3bb..ab30717e9b 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -12,7 +12,7 @@ #ifndef __CHOICEDLGH_G__ #define __CHOICEDLGH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choicdgg.h" #endif @@ -28,7 +28,8 @@ class WXDLLEXPORT wxListBox; #define wxCHOICE_HEIGHT 150 #define wxCHOICE_WIDTH 200 -#define wxCHOICEDLG_STYLE (wxDEFAULT_DIALOG_STYLE|wxOK | wxCANCEL | wxCENTRE) +#define wxCHOICEDLG_STYLE \ + (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE) // ---------------------------------------------------------------------------- // wxAnyChoiceDialog: a base class for dialogs containing a listbox @@ -61,6 +62,8 @@ public: protected: wxListBox *m_listbox; + + DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog) }; // ---------------------------------------------------------------------------- @@ -128,7 +131,7 @@ protected: wxString m_stringSelection; private: - DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog) DECLARE_EVENT_TABLE() }; @@ -170,7 +173,7 @@ protected: wxArrayInt m_selections; private: - DECLARE_DYNAMIC_CLASS(wxMultiChoiceDialog) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog) }; // ----------------------------------------------------------------------------