fixedb ug with normalization of UNC paths (patch 558701)

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index b1e1eeade7c0d842a0611b5e240ec64fa23f90dd..de30ac832c14c3183a5f63a10d49b7eec78665d2 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -45,7 +45,7 @@
 
 // there is no src/{msw,mgl}/popupwin.cpp to put this in, so we do it here - BTW we
 // probably could do it for all ports here just as well
 
 // there is no src/{msw,mgl}/popupwin.cpp to put this in, so we do it here - BTW we
 // probably could do it for all ports here just as well

-#if defined(__WXMSW__) || defined(__WXMGL__)
+#if defined(__WXMSW__) || defined(__WXMGL__) || defined(__WXPM__)

     IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 #endif // __WXMSW__
 
     IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 #endif // __WXMSW__
 


@@ -304,6 +304,10 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
 // wxPopupComboWindow
 // ----------------------------------------------------------------------------
 
 // wxPopupComboWindow
 // ----------------------------------------------------------------------------
 

+BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
+    EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
+END_EVENT_TABLE()
+

 wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
                   : wxPopupTransientWindow(parent)
 {
 wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
                   : wxPopupTransientWindow(parent)
 {


@@ -341,6 +345,11 @@ void wxPopupComboWindow::OnDismiss()
     m_combo->OnDismiss();
 }
 
     m_combo->OnDismiss();
 }
 

+void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
+{
+    m_combo->ProcessEvent(event);
+}
+

 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------