unneeded line removed

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 1ea6050d468b9f9a1084622b31507ae104732c96..4bba2263d7e1711c595c84382e3b827fa2eb65a5 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/choice.h"
 
 #ifndef WX_PRECOMP
 #include "wx/choice.h"

+#include "wx/utils.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -93,7 +94,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
 
 /*
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
 
 /*

-#if CTL3D
+#if wxUSE_CTL3D

   if (want3D)
   {
     m_useCtl3D = TRUE;
   if (want3D)
   {
     m_useCtl3D = TRUE;


@@ -204,7 +205,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
 
   int cx; // button font dimensions
   int cy;
 
   int cx; // button font dimensions
   int cy;

-  wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());

 
   int control_width, control_height;
 
 
   int control_width, control_height;
 


@@ -232,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));
       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;
       }
         if ( len > longest)
             longest = len;
       }