AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MSW compilation fixes for !wxUSE_VALIDATORS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-06 18:23:59 +00:00
parent 850ff48550
commit 11b6a93b1e
14 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/msw/bmpbuttn.cpp
View File

@ -39,7 +39,10 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
{
m_buttonBitmap = bitmap;
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
parent->AddChild(this);

20
src/msw/checkbox.cpp
View File

@ -39,8 +39,8 @@
// macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
// ============================================================================
// implementation
@ -60,14 +60,18 @@ bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
}
// Single check box item
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
bool wxCheckBox::Create(wxWindow *parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
@ -194,7 +198,9 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;

2
src/msw/combobox.cpp
View File

@ -72,7 +72,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
// SetBackgroundColour(parent->GetBackgroundColour()) ;

6
src/msw/fontenum.cpp
View File

@ -111,11 +111,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
}
#if defined(__GNUWIN32__)
#if defined(__MINGW32__)
#define wxFONTENUMPROC FONTENUMPROC
#else
#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
#endif
#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
#else
#define wxFONTENUMPROC FONTENUMPROC
#endif

2
src/msw/gauge95.cpp
View File

@ -44,7 +44,9 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
m_rangeMax = range;

2
src/msw/gaugemsw.cpp
View File

@ -80,7 +80,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
}
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
m_rangeMax = range;

2
src/msw/listbox.cpp
View File

@ -138,7 +138,9 @@ bool wxListBox::Create(wxWindow *parent,
m_selected = 0;
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent)
parent->AddChild(this);

3
src/msw/listctrl.cpp
View File

@ -126,7 +126,10 @@ bool wxListCtrl::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name)
{
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
SetName(name);
int x = pos.x;

2
src/msw/radiobut.cpp
View File

@ -52,7 +52,9 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);

2
src/msw/scrolbar.cpp
View File

@ -48,7 +48,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
return FALSE;
parent->AddChild(this);
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;

2
src/msw/slider95.cpp
View File

@ -58,7 +58,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;

2
src/msw/slidrmsw.cpp
View File

@ -52,7 +52,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;

2
src/msw/statbox.cpp
View File

@ -59,7 +59,7 @@ bool wxStaticBox::Create(wxWindow *parent,
long style,
const wxString& name)
{
if ( !CreateControl(parent, id, pos, size, style, name) )
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label, 0) )

2
src/msw/tbar95.cpp
View File

@ -192,7 +192,7 @@ bool wxToolBar::Create(wxWindow *parent,
const wxString& name)
{
// common initialisation
if ( !CreateControl(parent, id, pos, size, style, name) )
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
// prepare flags