somehow log target wasn't being created automatically anymore. Restored.

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index bc0ab64e1824f13c521d65675e5f1477853bb9ae..61119e6b67b43a9e8f3388d82ec3045e7418be12 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -34,7 +34,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
   if (param == CBN_SELCHANGE)
   {
-    wxCommandEvent event(wxEVENT_TYPE_CHOICE_COMMAND, m_windowId);
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(copystring(GetStringSelection()));
@@ -58,7 +58,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
   SetForegroundColour(parent->GetDefaultForegroundColour()) ;
-  no_strings = n;
+  m_noStrings = n;
 
   m_windowStyle = style;
 
@@ -121,19 +121,19 @@ void wxChoice::Append(const wxString& item)
 {
   SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
 
-  no_strings ++;
+  m_noStrings ++;
 }
 
 void wxChoice::Delete(int n)
 {
-  no_strings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
+  m_noStrings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
 }
 
 void wxChoice::Clear(void)
 {
   SendMessage((HWND) GetHWND(), CB_RESETCONTENT, 0, 0);
 
-  no_strings = 0;
+  m_noStrings = 0;
 }
 
 
@@ -192,6 +192,8 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
   // If we're prepared to use the existing size, then...
   if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
   {
@@ -216,14 +218,14 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (width <= 0)
   {
     // Find the longest string
-    if (no_strings == 0)
+    if (m_noStrings == 0)
       control_width = (float)100.0;
     else
     {
       int len, ht;
       float longest = (float)0.0;
       int i;
-      for (i = 0; i < no_strings; i++)
+      for (i = 0; i < m_noStrings; i++)
       {
         wxString str(GetString(i));
         GetTextExtent(str, &len, &ht, NULL, NULL,GetFont());
@@ -237,14 +239,14 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
   // Choice drop-down list depends on number of items (limited to 10)
   if (h1 <= 0)
   {
-    if (no_strings == 0)
+    if (m_noStrings == 0)
       h1 = (int)(EDIT_CONTROL_FACTOR*cy*10.0);
-    else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, no_strings) + 1));
+    else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, m_noStrings) + 1));
   }
 
   // If non-default width...
-  if (width >= 0)
-    control_width = (float)width;
+  if (w1 >= 0)
+    control_width = (float)w1;
 
   control_height = (float)h1;