Document lack of wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK under OS X.

[wxWidgets.git] / src / osx / carbon / combobox.cpp

diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index 2662bb8bd0ef2aa8a532c58df99ee4c1befdd7f6..73bbbad274fb761d9770d184790f24e073193b85 100644 (file)
--- a/src/osx/carbon/combobox.cpp
+++ b/src/osx/carbon/combobox.cpp
@@ -25,13 +25,6 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
-
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
-END_EVENT_TABLE()
-
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -65,7 +58,7 @@ protected:
         {
             wxNavigationKeyEvent NavEvent;
             NavEvent.SetEventObject(this);
         {
             wxNavigationKeyEvent NavEvent;
             NavEvent.SetEventObject(this);

-            NavEvent.SetDirection(true);
+            NavEvent.SetDirection(!event.ShiftDown());

             NavEvent.SetWindowChange(false);
 
             // Get the parent of the combo and have it process the navigation?
             NavEvent.SetWindowChange(false);
 
             // Get the parent of the combo and have it process the navigation?


@@ -318,11 +311,6 @@ void wxComboBox::DelegateChoice( const wxString& value )
     SetStringSelection( value );
 }
 
     SetStringSelection( value );
 }
 

-void wxComboBox::Init()
-{
-    WX_INIT_CONTROL_CONTAINER();
-}
-

 bool wxComboBox::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& value,
 bool wxComboBox::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& value,