added more icons (for GTK only) (patch 1097684)

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 070285404f0fa140d79add37bfc464477f27dc77..110daa1c21545afef76e1f5df17d90e329eb95cd 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -9,10 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "combobox.h"
 #endif
 
 #pragma implementation "combobox.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
+

 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"


@@ -68,18 +72,18 @@ public:
 protected:
     void OnChar( wxKeyEvent& event )
     {
 protected:
     void OnChar( wxKeyEvent& event )
     {

-       // Allows processing the tab key to go to the next control
-       if (event.GetKeyCode() == WXK_TAB)
-       {
-               wxNavigationKeyEvent NavEvent;
-               NavEvent.SetEventObject(this);
-               NavEvent.SetDirection(true);
-               NavEvent.SetWindowChange(false);
-
-                // Get the parent of the combo and have it process the navigation?
-               if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent))
+        // Allows processing the tab key to go to the next control
+        if (event.GetKeyCode() == WXK_TAB)
+        {
+            wxNavigationKeyEvent NavEvent;
+            NavEvent.SetEventObject(this);
+            NavEvent.SetDirection(true);
+            NavEvent.SetWindowChange(false);
+
+            // Get the parent of the combo and have it process the navigation?
+            if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent))

                     return;
                     return;

-       }
+        }

         if ( event.GetKeyCode() == WXK_RETURN )
         {
             wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());
         if ( event.GetKeyCode() == WXK_RETURN )
         {
             wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());


@@ -119,7 +123,7 @@ protected:
     // but this is less complicated than dealing with idle-ness, and is much better than nothing
     void OnKeyUp( wxKeyEvent& event )
     {
     // but this is less complicated than dealing with idle-ness, and is much better than nothing
     void OnKeyUp( wxKeyEvent& event )
     {

-        if ( event.GetKeyCode() != WXK_RETURN )
+        if ( event.GetKeyCode() != WXK_RETURN && event.GetKeyCode() != WXK_TAB )

         {
             wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId());
             event.SetString( GetValue() );
         {
             wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId());
             event.SetString( GetValue() );


@@ -269,17 +273,17 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxComboBox::SetFocus()
 }
 
 void wxComboBox::SetFocus()


@@ -330,7 +334,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {

-        return FALSE;
+        return false;

     }
 
     m_choice = new wxComboBoxChoice(this, style );
     }
 
     m_choice = new wxComboBoxChoice(this, style );


@@ -357,8 +361,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems

-
-    return TRUE;
+    SetStringSelection(value);
+    
+    return true;

 }
 
 wxString wxComboBox::GetValue() const
 }
 
 wxString wxComboBox::GetValue() const


@@ -452,7 +457,7 @@ long wxComboBox::GetInsertionPoint() const
     return 0;
 }
 
     return 0;
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -563,18 +568,6 @@ wxString wxComboBox::GetStringSelection() const
         return wxEmptyString;
 }
 
         return wxEmptyString;
 }
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
-{
-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return TRUE;
-        }
-    else
-        return FALSE;
-}
-

 void wxComboBox::SetString(int n, const wxString& s)
 {
     m_choice->SetString( n , s ) ;
 void wxComboBox::SetString(int n, const wxString& s)
 {
     m_choice->SetString( n , s ) ;


@@ -582,7 +575,7 @@ void wxComboBox::SetString(int n, const wxString& s)
 
 bool wxComboBox::IsEditable() const
 {
 
 bool wxComboBox::IsEditable() const
 {

-       return m_text != NULL && !HasFlag(wxCB_READONLY);
+    return m_text != NULL && !HasFlag(wxCB_READONLY);

 }
 
 void wxComboBox::Undo()
 }
 
 void wxComboBox::Undo()


@@ -654,3 +647,4 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     return noErr ;
 }
 
     return noErr ;
 }
 

+#endif