Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.

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

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 8ea92291e2cfd4a9f524fafc3af4310c0c285464..830e8564a77c5e1a1895c39b4366c3b6f0c278b4 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"

+#include "wx/button.h"

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


@@ -59,7 +60,7 @@ public:
 protected:
     void OnChar( wxKeyEvent& event )
     {
 protected:
     void OnChar( wxKeyEvent& event )
     {

-        if ( event.KeyCode() == WXK_RETURN )
+        if ( event.GetKeyCode() == WXK_RETURN )

         {
             wxString value = GetValue();
 
         {
             wxString value = GetValue();
 


@@ -95,7 +96,7 @@ protected:
 
                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
 
                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {

-                  parent = parent->GetParent() ;
+                    parent = parent->GetParent() ;

                 }
                 if ( parent && parent->GetDefaultItem() )
                 {
                 }
                 if ( parent && parent->GetDefaultItem() )
                 {


@@ -204,7 +205,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     }
     else
     {
     }
     else
     {

-        wxCoord wText = width - POPUPWIDTH;
+        wxCoord wText = width - POPUPWIDTH - MARGIN;

         m_text->SetSize(0, 0, wText, height);
         m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    
         m_text->SetSize(0, 0, wText, height);
         m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    


@@ -261,10 +262,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-
-    Rect bounds ;
-    Str255 title ;
-

     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {


@@ -314,6 +311,11 @@ wxString wxComboBox::GetValue() const
 
 void wxComboBox::SetValue(const wxString& value)
 {
 
 void wxComboBox::SetValue(const wxString& value)
 {

+    int s = FindString (value);
+    if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
+    {
+        m_choice->Append(value) ;
+    }

     SetStringSelection( value ) ;
 }
 
     SetStringSelection( value ) ;
 }
 


@@ -400,13 +402,34 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
     // TODO
 }
 

-void wxComboBox::Append(const wxString& item)
+int wxComboBox::DoAppend(const wxString& item) 
+{
+    return m_choice->DoAppend( item ) ;
+}
+
+int wxComboBox::DoInsert(const wxString& item, int pos) 
+{
+    return m_choice->DoInsert( item , pos ) ;
+}
+
+void wxComboBox::DoSetItemClientData(int n, void* clientData) 
+{
+    return m_choice->SetClientData( n , clientData ) ;
+}
+
+void* wxComboBox::DoGetItemClientData(int n) const

 {
 {

-    // I am not sure what other ports do,
-    // but wxMac chokes on empty entries.
+    return m_choice->GetClientData( n ) ;
+}

 
 

-    if (!item.IsEmpty())
-        m_choice->DoAppend( item );
+void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+    return m_choice->SetClientObject( n , clientData ) ;
+}
+
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
+{
+    return m_choice->GetClientObject( n ) ;

 }
 
 void wxComboBox::Delete(int n)
 }
 
 void wxComboBox::Delete(int n)


@@ -450,7 +473,7 @@ wxString wxComboBox::GetStringSelection() const
     if (sel > -1)
         return wxString(this->GetString (sel));
     else
     if (sel > -1)
         return wxString(this->GetString (sel));
     else

-        return wxString("");
+        return wxEmptyString;

 }
 
 bool wxComboBox::SetStringSelection(const wxString& sel)
 }
 
 bool wxComboBox::SetStringSelection(const wxString& sel)


@@ -465,7 +488,13 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
         return FALSE;
 }
 
         return FALSE;
 }
 

-void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxComboBox::SetString(int n, const wxString& s) 
+{
+    m_choice->SetString( n , s ) ;
+}
+
+
+void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) 

 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());