removed wxCHOICEDLG_DIALOG_STYLE, use only wxCHOICEDLG_STYLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,17 +53,6 @@
|
|||||||
|
|
||||||
#define wxID_LISTBOX 3000
|
#define wxID_LISTBOX 3000
|
||||||
|
|
||||||
#if defined(__WXMSW__) || defined(__WXMAC__)
|
|
||||||
#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \
|
|
||||||
wxDIALOG_MODAL | \
|
|
||||||
wxTAB_TRAVERSAL)
|
|
||||||
#else
|
|
||||||
#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \
|
|
||||||
wxDIALOG_MODAL | \
|
|
||||||
wxRESIZE_BORDER | \
|
|
||||||
wxTAB_TRAVERSAL)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// private functions
|
// private functions
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -321,8 +310,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
|
|||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
long styleLbox)
|
long styleLbox)
|
||||||
{
|
{
|
||||||
if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize,
|
if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize, styleDlg) )
|
||||||
wxCHOICEDLG_DIALOG_STYLE) )
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
Reference in New Issue
Block a user