compilation fixes for wxUniv (moved wxDlgProc back to toplevel.cpp)

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 470a02654cf462dea87c1b646d1ce77d7376305e..e8bfc1b6d563b866f978398e0b6efc8067dc2cf9 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -87,16 +87,30 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 
     switch ( message )
     {
 
     switch ( message )
     {

-        // forward some messages to the combobox
+        // forward some messages to the combobox to generate the appropriate
+        // wxEvents from them

         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:

+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:

             {
                 wxComboBox *combo = wxDynamicCast(win, wxComboBox);
             {
                 wxComboBox *combo = wxDynamicCast(win, wxComboBox);

-                wxCHECK_MSG( combo, 0, _T("should have combo as parent") );
-
-                if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
+                if ( !combo )
+                {
+                    // we can get WM_KILLFOCUS while our parent is already half
+                    // destroyed and hence doesn't look like a combobx any
+                    // longer, check for it to avoid bogus assert failures
+                    if ( !win->IsBeingDeleted() )
+                    {
+                        wxFAIL_MSG( _T("should have combo as parent") );
+                    }
+                }
+                else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
+                {
+                    // handled by parent

                     return 0;
                     return 0;

+                }

             }
             break;
 
             }
             break;
 


@@ -170,7 +184,7 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())

-        colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

 
     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
 
     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));


@@ -196,6 +210,12 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);
 
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);

+
+        case WM_SETFOCUS:
+            return HandleSetFocus((WXHWND)wParam);
+
+        case WM_KILLFOCUS:
+            return HandleKillFocus((WXHWND)wParam);

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -311,11 +331,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
         return FALSE;
 
     if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
         return FALSE;
 

-    SetSize(pos.x, pos.y, size.x, size.y);
-

     // A choice/combobox normally has a white background (or other, depending
     // on global settings) rather than inheriting the parent's background colour.
     // A choice/combobox normally has a white background (or other, depending
     // on global settings) rather than inheriting the parent's background colour.

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

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


@@ -327,6 +345,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         SetValue(value);
     }
 
         SetValue(value);
     }
 

+    // do this after appending the values to the combobox so that autosizing
+    // works correctly
+    SetSize(pos.x, pos.y, size.x, size.y);
+

     // a (not read only) combobox is, in fact, 2 controls: the combobox itself
     // and an edit control inside it and if we want to catch events from this
     // edit control, we must subclass it as well
     // a (not read only) combobox is, in fact, 2 controls: the combobox itself
     // and an edit control inside it and if we want to catch events from this
     // edit control, we must subclass it as well