Call wxApp::ProcessPendingEvents() from wxX11 event loop.

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 7ae8dfc956e54695c33dd03ce5c3cb43edc1dd01..8fbcce2237fc16541b1d0baad54a1035a247cb78 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -188,7 +188,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
                     // longer, check for it to avoid bogus assert failures
                     if ( !win->IsBeingDeleted() )
                     {
                     // longer, check for it to avoid bogus assert failures
                     if ( !win->IsBeingDeleted() )
                     {

-                        wxFAIL_MSG( _T("should have combo as parent") );
+                        wxFAIL_MSG( wxT("should have combo as parent") );

                     }
                 }
                 else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
                     }
                 }
                 else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )


@@ -201,7 +201,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 
         case WM_GETDLGCODE:
             {
 
         case WM_GETDLGCODE:
             {

-                wxCHECK_MSG( win, 0, _T("should have a parent") );
+                wxCHECK_MSG( win, 0, wxT("should have a parent") );

 
                 if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
                 {
 
                 if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
                 {


@@ -342,8 +342,19 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
                 // down is cancelled (see #8474)
                 m_lastAcceptedSelection = wxID_NONE;
             }
                 // down is cancelled (see #8474)
                 m_lastAcceptedSelection = wxID_NONE;
             }

+            {
+                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+                event.SetEventObject(this);
+                ProcessCommand(event);
+            }
+            break;
+        case CBN_CLOSEUP:
+            {
+                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+                event.SetEventObject(this);
+                ProcessCommand(event);
+            }

             break;
             break;

-

         case CBN_SELENDOK:
 #ifndef __SMARTPHONE__
             // we need to reset this to prevent the selection from being undone
         case CBN_SELENDOK:
 #ifndef __SMARTPHONE__
             // we need to reset this to prevent the selection from being undone


@@ -441,10 +452,10 @@ WXHWND wxComboBox::GetEditHWND() const
     // this function should not be called for wxCB_READONLY controls, it is
     // the callers responsibility to check this
     wxASSERT_MSG( !HasFlag(wxCB_READONLY),
     // this function should not be called for wxCB_READONLY controls, it is
     // the callers responsibility to check this
     wxASSERT_MSG( !HasFlag(wxCB_READONLY),

-                  _T("read-only combobox doesn't have any edit control") );
+                  wxT("read-only combobox doesn't have any edit control") );

 
     WXHWND hWndEdit = GetEditHWNDIfAvailable();
 
     WXHWND hWndEdit = GetEditHWNDIfAvailable();

-    wxASSERT_MSG( hWndEdit, _T("combobox without edit control?") );
+    wxASSERT_MSG( hWndEdit, wxT("combobox without edit control?") );

 
     return hWndEdit;
 }
 
     return hWndEdit;
 }


@@ -452,7 +463,7 @@ WXHWND wxComboBox::GetEditHWND() const
 wxWindow *wxComboBox::GetEditableWindow()
 {
     wxASSERT_MSG( !HasFlag(wxCB_READONLY),
 wxWindow *wxComboBox::GetEditableWindow()
 {
     wxASSERT_MSG( !HasFlag(wxCB_READONLY),

-                  _T("read-only combobox doesn't have any edit control") );
+                  wxT("read-only combobox doesn't have any edit control") );

 
     return this;
 }
 
     return this;
 }