Removed my buggy bug-fix

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 8c4aede0bd29ece460caafd21a99bb8dcba5bc18..a901873db3f5b16cf13d1e541ccc5bbbfb50fa74 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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"


@@ -48,8 +49,8 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,

-                  int n, const wxString choices[],
-                  long style,
+       int n, const wxString choices[],
+       long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {


@@ -58,14 +59,14 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;

-  m_noStrings = n;
+  m_noStrings = 0;

 
   m_windowStyle = style;
 
   if ( id == -1 )
 
   m_windowStyle = style;
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+    m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+  m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -82,16 +83,18 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

-  if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )

     msStyle |= WS_BORDER;
 
     msStyle |= WS_BORDER;
 

-  HWND wx_combo = CreateWindowEx(exStyle, "COMBOBOX", NULL,
+  m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "COMBOBOX", NULL,

                    msStyle,
                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                    wxGetInstance(), NULL);
                    msStyle,
                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                    wxGetInstance(), NULL);

+
+  wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
+

 /*
 /*

-#if CTL3D
+#if wxUSE_CTL3D

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


@@ -100,17 +103,17 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 #endif
 */
 
 #endif
 */
 

-  m_hWnd = (WXHWND) wx_combo;
-

   // Subclass again for purposes of dialog editing mode
   // Subclass again for purposes of dialog editing mode

-  SubclassWin((WXHWND) wx_combo);
+  SubclassWin(m_hWnd);

 
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   int i;
   for (i = 0; i < n; i++)
 
   int i;
   for (i = 0; i < n; i++)

-    SendMessage(wx_combo, CB_INSERTSTRING, i, (LONG)(const char *)choices[i]);
-  SendMessage(wx_combo, CB_SETCURSEL, i, 0);
+  {
+    Append(choices[i]);
+  }
+  SetSelection(n);

 
   SetSize(x, y, width, height);
 
 
   SetSize(x, y, width, height);
 


@@ -177,7 +180,7 @@ wxString wxChoice::GetString(int n) const
   return wxString(wxBuffer);
 }
 
   return wxString(wxBuffer);
 }
 

-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -202,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;
 


@@ -230,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;
       }


@@ -238,6 +241,12 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
       control_width = longest + cx*5;
     }
   }
       control_width = longest + cx*5;
     }
   }

+  else
+  {
+    // If non-default width...
+    control_width = w1;
+  }
+

 
   // Choice drop-down list depends on number of items (limited to 10)
   if (h1 <= 0)
 
   // Choice drop-down list depends on number of items (limited to 10)
   if (h1 <= 0)


@@ -248,10 +257,6 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
         h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMin(10, m_noStrings) + 1);
   }
 
         h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMin(10, m_noStrings) + 1);
   }
 

-  // If non-default width...
-  if (w1 >= 0)
-    control_width = w1;
-

   control_height = h1;
 
   // Calculations may have made text size too small
   control_height = h1;
 
   // Calculations may have made text size too small


@@ -266,9 +271,9 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 }
 
 WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-       return 0;
+  return 0;

 }
 
 long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 }
 
 long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)