Fix for ambiguities which happen in STL=1 mode under DigitalMars C++.

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index a99586da5cb033cb7b65ce79cf15b049e8af96ee..63869411c44db239f29f02948dfe2d0214187cd5 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -158,7 +158,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         wxFAIL_MSG(wxString::Format
                    (
                     _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"),
-                    classname, style, exstyle
+                    classname, (unsigned int)style, (unsigned int)exstyle
                    ));
 #endif // __WXDEBUG__
 
@@ -212,7 +212,7 @@ wxSize wxControl::DoGetBestSize() const
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
 // wxChoice and others.
-wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
+wxSize wxControl::GetBestSpinnerSize(const bool is_vertical) const
 {
     // take size according to layout
     wxSize bestSize(
@@ -359,7 +359,7 @@ WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
 {
     // by default consider that the controls text shouldn't erase the
     // background under it (this is true for all static controls, check boxes,
-    // radio buttons, ...
+    // radio buttons, ...)
     ::SetBkMode((HDC)pDC, TRANSPARENT);
 
     return DoMSWControlColor(pDC, wxNullColour);