Fixing inactive state drawing, and removing warning.

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

diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp
index 061a8b165b006edc10550848db175b35916108d9..2879e2a3eb5920b3190e79c170f9b896c53ba865 100644 (file)
--- a/src/mac/classic/combobox.cpp
+++ b/src/mac/classic/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.cpp
+// Name:        src/mac/classic/combobox.cpp

 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,18 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+#include "wx/wxprec.h"

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

-#include "wx/button.h"
-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+    #include "wx/menu.h"
+#endif
+

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif

 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 


@@ -94,14 +94,10 @@ protected:
                 // This will invoke the dialog default action, such
                 // as the clicking the default button.
 
                 // This will invoke the dialog default action, such
                 // as the clicking the default button.
 

-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                    parent = parent->GetParent() ;
-                }
-                if ( parent && parent->GetDefaultItem() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )

                 {
                 {

-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);

                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );


@@ -140,7 +136,7 @@ public:
 protected:
     void OnChoice( wxCommandEvent& e )
     {
 protected:
     void OnChoice( wxCommandEvent& e )
     {

-        wxString    s = e.GetString();
+        wxString s = e.GetString();

 
         m_cb->DelegateChoice( s );
         wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
 
         m_cb->DelegateChoice( s );
         wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );


@@ -223,17 +219,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()


@@ -284,7 +280,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 );


@@ -309,12 +305,12 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
         m_choice->DoAppend( choices[ i ] );
     }
 

-    return TRUE;
+    return true;

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

-    wxString        result;
+    wxString result;

 
     if ( m_text == NULL )
     {
 
     if ( m_text == NULL )
     {


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

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

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


@@ -426,27 +422,27 @@ int wxComboBox::DoAppend(const wxString& item)
     return m_choice->DoAppend( item ) ;
 }
 
     return m_choice->DoAppend( item ) ;
 }
 

-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)

 {
     return m_choice->DoInsert( item , pos ) ;
 }
 
 {
     return m_choice->DoInsert( item , pos ) ;
 }
 

-void wxComboBox::DoSetItemClientData(int n, void* clientData)
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
     return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 
 {
     return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 

-void* wxComboBox::DoGetItemClientData(int n) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const

 {
     return m_choice->DoGetItemClientData( n ) ;
 }
 
 {
     return m_choice->DoGetItemClientData( n ) ;
 }
 

-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
 {

-    return m_choice->DoSetItemClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject(n , clientData);

 }
 
 }
 

-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const

 {
     return m_choice->DoGetItemClientObject( n ) ;
 }
 {
     return m_choice->DoGetItemClientObject( n ) ;
 }


@@ -455,15 +451,15 @@ void wxComboBox::FreeData()
 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {

-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )

         {
             SetClientObject( n, NULL );
         }
     }
 }
 
         {
             SetClientObject( n, NULL );
         }
     }
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)

 {
     // force client object deletion
     if( HasClientObjectData() )
 {
     // force client object deletion
     if( HasClientObjectData() )


@@ -488,16 +484,16 @@ void wxComboBox::SetSelection(int n)
 
     if ( m_text != NULL )
     {
 
     if ( m_text != NULL )
     {

-        m_text->SetValue( GetString( n ) );
+        m_text->SetValue(GetString(n));

     }
 }
 
     }
 }
 

-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase ) const

 {
 {

-    return m_choice->FindString( s );
+    return m_choice->FindString( s , bCase );

 }
 
 }
 

-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
     return m_choice->GetString( n );
 }
 {
     return m_choice->GetString( n );
 }


@@ -505,33 +501,21 @@ wxString wxComboBox::GetString(int n) const
 wxString wxComboBox::GetStringSelection() const
 {
     int sel = GetSelection ();
 wxString wxComboBox::GetStringSelection() const
 {
     int sel = GetSelection ();

-    if (sel > -1)
-        return wxString(this->GetString (sel));
-    else
-        return wxEmptyString;
-}

 
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
-{
-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return TRUE;
-        }
+    if (sel != wxNOT_FOUND)
+        return wxString(this->GetString((unsigned int)sel));

     else
     else

-        return FALSE;
+        return wxEmptyString;

 }
 
 }
 

-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)

 {
 {

-    m_choice->SetString( n , s ) ;
+    m_choice->SetString( n , 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()


@@ -600,4 +584,3 @@ void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXU
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }

-