Digital Mars compilation warnings and Unicode fixes (patch 884587)

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

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 7bac2630c465cd8748c4c63ca68df9b141bd3554..27aa1a58de3e840e05d6153dc326262a3e011822 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"
 


@@ -51,18 +52,69 @@ class wxComboBoxText : public wxTextCtrl
 {
 public:
     wxComboBoxText( wxComboBox * cb )
 {
 public:
     wxComboBoxText( wxComboBox * cb )

-        : wxTextCtrl( cb->GetParent(), 1 )
+        : wxTextCtrl( cb , 1 )

     {
         m_cb = cb;
     }
 
 protected:
     {
         m_cb = cb;
     }
 
 protected:

-    void OnTextChange( wxCommandEvent& event )
+    void OnChar( wxKeyEvent& event )

     {
     {

-        wxString    s = GetValue();
-            
-        m_cb->DelegateTextChanged( s );
-
+        if ( event.GetKeyCode() == WXK_RETURN )
+        {
+            wxString value = GetValue();
+
+            if ( m_cb->GetCount() == 0 )
+            {
+                // make Enter generate "selected" event if there is only one item
+                // in the combobox - without it, it's impossible to select it at
+                // all!
+                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+                event.SetInt( 0 );
+                event.SetString( value );
+                event.SetEventObject( m_cb );
+                m_cb->GetEventHandler()->ProcessEvent( event );
+            }
+            else
+            {
+                // add the item to the list if it's not there yet
+                if ( m_cb->FindString(value) == wxNOT_FOUND )
+                {
+                    m_cb->Append(value);
+                    m_cb->SetStringSelection(value);
+
+                    // and generate the selected event for it
+                    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+                    event.SetInt( m_cb->GetCount() - 1 );
+                    event.SetString( value );
+                    event.SetEventObject( m_cb );
+                    m_cb->GetEventHandler()->ProcessEvent( event );
+                }
+
+                // 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() )
+                {
+                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
+                                                          wxButton);
+                    if ( def && def->IsEnabled() )
+                    {
+                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        event.SetEventObject(def);
+                        def->Command(event);
+                        return ;
+                   }
+                }
+
+                return;
+            }
+        }
+        

         event.Skip();
     }
 
         event.Skip();
     }
 


@@ -73,14 +125,14 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)

-    EVT_TEXT(-1, wxComboBoxText::OnTextChange)
+    EVT_CHAR( wxComboBoxText::OnChar)

 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:
     wxComboBoxChoice(wxComboBox *cb, int style)
 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:
     wxComboBoxChoice(wxComboBox *cb, int style)

-        : wxChoice( cb->GetParent(), 1 )
+        : wxChoice( cb , 1 )

     {
         m_cb = cb;
     }
     {
         m_cb = cb;
     }


@@ -91,6 +143,11 @@ protected:
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );

+        wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+        event2.SetInt(m_cb->GetSelection());
+        event2.SetEventObject(m_cb);
+        event2.SetString(m_cb->GetStringSelection());
+        m_cb->ProcessCommand(event2);

     }
 
 private:
     }
 
 private:


@@ -103,16 +160,22 @@ BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 
     EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 

-
-
-

 wxComboBox::~wxComboBox()
 {
 wxComboBox::~wxComboBox()
 {

-   // delete the controls now, don't leave them alive even though they woudl
+    // delete client objects
+    FreeData();
+
+    // delete the controls now, don't leave them alive even though they would

     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now

-    delete m_text;
-    delete m_choice;
+    if (m_text != NULL) {
+        delete m_text;
+        m_text = NULL;
+    }
+    if (m_choice != NULL) {
+        delete m_choice;
+        m_choice = NULL;
+    }

 }
 
 
 }
 
 


@@ -124,7 +187,7 @@ wxSize wxComboBox::DoGetBestSize() const
 {
     wxSize size = m_choice->GetBestSize();
     
 {
     wxSize size = m_choice->GetBestSize();
     

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         wxSize  sizeText = m_text->GetBestSize();
         
     {
         wxSize  sizeText = m_text->GetBestSize();
         


@@ -139,15 +202,15 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     
     wxControl::DoMoveWindow(x, y, width, height);
 
     
     wxControl::DoMoveWindow(x, y, width, height);
 

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
     {

-        m_choice->SetSize(x, y, width, -1);
+        m_choice->SetSize(0, 0 , width, -1);

     }
     else
     {
     }
     else
     {

-        wxCoord wText = width - POPUPWIDTH;
-        m_text->SetSize(x, y, wText, height);
-        m_choice->SetSize(x + wText + MARGIN, y, POPUPWIDTH, -1);
+        wxCoord wText = width - POPUPWIDTH - MARGIN;
+        m_text->SetSize(0, 0, wText, height);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);

     }    
 }
 
     }    
 }
 


@@ -162,13 +225,6 @@ bool wxComboBox::Enable(bool enable)
     if ( !wxControl::Enable(enable) )
         return FALSE;
 
     if ( !wxControl::Enable(enable) )
         return FALSE;
 

-    m_choice->Enable(enable);
-    
-    if ( m_text != 0 )
-    {
-        m_text->Enable(enable);
-    }
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -177,27 +233,20 @@ bool wxComboBox::Show(bool show)
     if ( !wxControl::Show(show) )
         return FALSE;
 
     if ( !wxControl::Show(show) )
         return FALSE;
 

-    // under GTK Show() is called the first time before we are fully
-    // constructed
-    if ( m_choice )
-    {
-        m_choice->Show(show);
-        if ( m_text != 0 )
-        {
-            m_text->Show(show);
-        }
-    }
-

     return TRUE;
 }
 
     return TRUE;
 }
 

- void wxComboBox::SetFocus()
- {
-    m_text->SetFocus();
- }
+void wxComboBox::SetFocus()
+{
+    if ( m_text != NULL) {
+        m_text->SetFocus();
+    }
+}

 
 
 
 

-void wxComboBox::DelegateTextChanged( const wxString& value ) {
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{
+    SetStringSelection( value );

 }
 
 
 }
 
 


@@ -211,27 +260,39 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,

-           int n, const wxString choices[],
+           const wxArrayString& choices,

            long style,
            const wxValidator& validator,
            const wxString& name)
 {
            long style,
            const wxValidator& validator,
            const wxString& name)
 {

+    wxCArrayString chs( choices );
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}

 
 

-    Rect bounds ;
-    Str255 title ;

 
 

-    if ( !wxControl::Create(parent, id, pos, size, style,
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           int n, const wxString choices[],
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,

                             wxDefaultValidator, name) )
     {
         return FALSE;
     }
 
                             wxDefaultValidator, name) )
     {
         return FALSE;
     }
 

-    m_choice = new wxComboBoxChoice(this, style);
+    m_choice = new wxComboBoxChoice(this, style );

 
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
 
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {

-        m_text = 0;
+        m_text = NULL;

     }
     else
     {
     }
     else
     {


@@ -242,21 +303,12 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
     
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     }
     
     DoSetSize(pos.x, pos.y, csize.x, csize.y);

+    

     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 
     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 

-    // have to disable this window to avoid interfering it with message
-    // processing to the text and the button... but pretend it is enabled to
-    // make IsEnabled() return TRUE
-    wxControl::Enable(FALSE); // don't use non virtual Disable() here!
-    m_isEnabled = TRUE;
-
-    // we don't even need to show this window itself - and not doing it avoids
-    // that it overwrites the text control
-    wxControl::Show(FALSE);
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -264,7 +316,7 @@ wxString wxComboBox::GetValue() const
 {
     wxString        result;
     
 {
     wxString        result;
     

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
         result = m_choice->GetString( m_choice->GetSelection() );
     }
     {
         result = m_choice->GetString( m_choice->GetSelection() );
     }


@@ -278,13 +330,18 @@ 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 ) ;
 }
 
 // Clipboard operations
 void wxComboBox::Copy()
 {
     SetStringSelection( value ) ;
 }
 
 // Clipboard operations
 void wxComboBox::Copy()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         m_text->Copy();
     }
     {
         m_text->Copy();
     }


@@ -292,7 +349,7 @@ void wxComboBox::Copy()
 
 void wxComboBox::Cut()
 {
 
 void wxComboBox::Cut()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         m_text->Cut();
     }
     {
         m_text->Cut();
     }


@@ -300,7 +357,7 @@ void wxComboBox::Cut()
 
 void wxComboBox::Paste()
 {
 
 void wxComboBox::Paste()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         m_text->Paste();
     }
     {
         m_text->Paste();
     }


@@ -308,14 +365,14 @@ void wxComboBox::Paste()
 
 void wxComboBox::SetEditable(bool editable)
 {
 
 void wxComboBox::SetEditable(bool editable)
 {

-    if ( ( m_text == 0 ) && editable )
+    if ( ( m_text == NULL ) && editable )

     {
         m_text = new wxComboBoxText( this );
     }
     {
         m_text = new wxComboBoxText( this );
     }

-    else if ( ( m_text != 0 ) && !editable )
+    else if ( ( m_text != NULL ) && !editable )

     {
         delete m_text;
     {
         delete m_text;

-        m_text = 0;
+        m_text = NULL;

     }
 
     int currentX, currentY;
     }
 
     int currentX, currentY;


@@ -364,18 +421,59 @@ 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->DoSetItemClientData( n , clientData ) ;
+}
+
+void* wxComboBox::DoGetItemClientData(int n) const

 {
 {

-    m_choice->DoAppend( item );
+    return m_choice->DoGetItemClientData( n ) ;
+}
+
+void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+    return m_choice->DoSetItemClientObject( n , clientData ) ;
+}
+
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
+{
+    return m_choice->DoGetItemClientObject( n ) ;
+}
+
+void wxComboBox::FreeData()
+{
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetClientObject( n, NULL );
+        }
+    }

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

+    // force client object deletion
+    if( HasClientObjectData() )
+        SetClientObject( n, NULL );

     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {
     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {

+    FreeData();

     m_choice->Clear();
 }
 
     m_choice->Clear();
 }
 


@@ -388,7 +486,7 @@ void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );
     
 {
     m_choice->SetSelection( n );
     

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         m_text->SetValue( GetString( n ) );
     }
     {
         m_text->SetValue( GetString( n ) );
     }


@@ -410,7 +508,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)


@@ -425,7 +523,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());