Removed child frame CreateStatusBar from MDI sample; renamed config.h to confbase.h;

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 850211d0dd21810d63ea816e993c1642f36545ca..61119e6b67b43a9e8f3388d82ec3045e7418be12 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -30,11 +30,11 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 
-bool wxChoice::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
+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()));
@@ -45,11 +45,11 @@ bool wxChoice::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
   else return FALSE;
 }
 
-bool wxChoice::Create(wxWindow *parent, const wxWindowID id,
+bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
-                  const int n, const wxString choices[],
-                  const long style,
+                  int n, const wxString choices[],
+                  long style,
            const wxValidator& validator,
            const wxString& name)
 {
@@ -58,7 +58,7 @@ bool wxChoice::Create(wxWindow *parent, const 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(const int n)
+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;
 }
 
 
@@ -142,7 +142,7 @@ int wxChoice::GetSelection(void) const
   return (int)SendMessage((HWND) GetHWND(), CB_GETCURSEL, 0, 0);
 }
 
-void wxChoice::SetSelection(const int n)
+void wxChoice::SetSelection(int n)
 {
   SendMessage((HWND) GetHWND(), CB_SETCURSEL, n, 0);
 }
@@ -170,14 +170,14 @@ int wxChoice::FindString(const wxString& s) const
 #endif
 }
 
-wxString wxChoice::GetString(const int n) const
+wxString wxChoice::GetString(int n) const
 {
   int len = (int)SendMessage((HWND) GetHWND(), CB_GETLBTEXT, n, (long)wxBuffer);
   wxBuffer[len] = 0;
   return wxString(wxBuffer);
 }
 
-void wxChoice::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -192,6 +192,8 @@ void wxChoice::SetSize(const int x, const int y, const int width, const int heig
   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(const int x, const int y, const int width, const int heig
   if (width <= 0)
   {
     // Find the longest string
-    if (no_strings == 0)
+    if (m_noStrings == 0)
       control_width = (float)100.0;
     else
     {
-      float len, ht;
+      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(const int x, const int y, const int width, const int heig
   // 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;
 
@@ -257,19 +259,9 @@ void wxChoice::SetSize(const int x, const int y, const int width, const int heig
 
   MoveWindow((HWND) GetHWND(), x1, y1,
                               (int)control_width, (int)control_height, TRUE);
-
-/*
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-#endif
-*/
 }
 
-WXHBRUSH wxChoice::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
        return 0;