Added George Tasker's forward slash fix to file dialog; added some consts to prntbase.h;

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index d36ce7fe087572c7d068adf4dce5fba9b28fd445..a31cd8a3663c9c142df7e3f0359e24b0b2ceb788 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -59,7 +59,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;
-  m_noStrings = n;
+  m_noStrings = 0;
 
   m_windowStyle = style;
 
@@ -94,7 +94,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
 
 /*
-#if CTL3D
+#if wxUSE_CTL3D
   if (want3D)
   {
     m_useCtl3D = TRUE;
@@ -205,7 +205,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
 
   int cx; // button font dimensions
   int cy;
-  wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
 
   int control_width, control_height;
 
@@ -233,7 +233,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
       for (i = 0; i < m_noStrings; i++)
       {
         wxString str(GetString(i));
-        GetTextExtent(str, &len, &ht, NULL, NULL, & GetFont());
+        GetTextExtent(str, &len, &ht, NULL, NULL, & this->GetFont());
         if ( len > longest)
             longest = len;
       }