take pixel sizes into account as well when comparing fonts, not just point sizes...

[wxWidgets.git] / src / common / ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 1d8421d7287df0a26acfb06af9d7410fabebede1..c94e8f2ca3a7edc06b3b093642bea01603f9a421 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/ctrlsub.cpp
+// Name:        src/common/ctrlsub.cpp

 // Purpose:     wxItemContainer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Purpose:     wxItemContainer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

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


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "controlwithitems.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,31 +28,103 @@
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"

+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

+IMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl)
+

 // ============================================================================
 // ============================================================================

-// implementation
+// wxItemContainerImmutable implementation

 // ============================================================================
 
 // ============================================================================
 

+wxItemContainerImmutable::~wxItemContainerImmutable()
+{
+    // this destructor is required for Darwin
+}
+

 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 

-wxString wxItemContainer::GetStringSelection() const
+wxString wxItemContainerImmutable::GetStringSelection() const

 {
     wxString s;
 {
     wxString s;

+

     int sel = GetSelection();
     int sel = GetSelection();

-    if ( sel != -1 )
-        s = GetString(sel);
+    if ( sel != wxNOT_FOUND )
+        s = GetString((unsigned int)sel);

 
     return s;
 }
 
 
     return s;
 }
 

+bool wxItemContainerImmutable::SetStringSelection(const wxString& s)
+{
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
+
+    SetSelection(sel);
+
+    return true;
+}
+
+wxArrayString wxItemContainerImmutable::GetStrings() const
+{
+    wxArrayString result;
+
+    const unsigned int count = GetCount();
+    result.Alloc(count);
+    for ( unsigned int n = 0; n < count; n++ )
+        result.Add(GetString(n));
+
+    return result;
+}
+
+// ============================================================================
+// wxItemContainer implementation
+// ============================================================================
+
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// appending items
+// ----------------------------------------------------------------------------
+
+void wxItemContainer::Append(const wxArrayString& strings)
+{
+    const size_t count = strings.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        Append(strings[n]);
+    }
+}
+
+int wxItemContainer::Insert(const wxString& item, unsigned int pos, void *clientData)
+{
+    int n = DoInsert(item, pos);
+    if ( n != wxNOT_FOUND )
+        SetClientData(n, clientData);
+
+    return n;
+}
+
+int wxItemContainer::Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
+{
+    int n = DoInsert(item, pos);
+    if ( n != wxNOT_FOUND )
+        SetClientObject(n, clientData);
+
+    return n;
+}
+

 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 

-void wxItemContainer::SetClientObject(int n, wxClientData *data)
+void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)

 {
     wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
                   wxT("can't have both object and void client data") );
 {
     wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
                   wxT("can't have both object and void client data") );


@@ -79,7 +147,7 @@ void wxItemContainer::SetClientObject(int n, wxClientData *data)
     DoSetItemClientObject(n, data);
 }
 
     DoSetItemClientObject(n, data);
 }
 

-wxClientData *wxItemContainer::GetClientObject(int n) const
+wxClientData *wxItemContainer::GetClientObject(unsigned int n) const

 {
     wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,
                   wxT("this window doesn't have object client data") );
 {
     wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,
                   wxT("this window doesn't have object client data") );


@@ -87,7 +155,7 @@ wxClientData *wxItemContainer::GetClientObject(int n) const
     return DoGetItemClientObject(n);
 }
 
     return DoGetItemClientObject(n);
 }
 

-void wxItemContainer::SetClientData(int n, void *data)
+void wxItemContainer::SetClientData(unsigned int n, void *data)

 {
     wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,
                   wxT("can't have both object and void client data") );
 {
     wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,
                   wxT("can't have both object and void client data") );


@@ -96,7 +164,7 @@ void wxItemContainer::SetClientData(int n, void *data)
     m_clientDataItemsType = wxClientData_Void;
 }
 
     m_clientDataItemsType = wxClientData_Void;
 }
 

-void *wxItemContainer::GetClientData(int n) const
+void *wxItemContainer::GetClientData(unsigned int n) const

 {
     wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
                   wxT("this window doesn't have void client data") );
 {
     wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
                   wxT("this window doesn't have void client data") );


@@ -104,4 +172,26 @@ void *wxItemContainer::GetClientData(int n) const
     return DoGetItemClientData(n);
 }
 
     return DoGetItemClientData(n);
 }
 

+// ============================================================================
+// wxControlWithItems implementation
+// ============================================================================
+
+void wxControlWithItems::InitCommandEventWithItems(wxCommandEvent& event, int n)
+{
+    InitCommandEvent(event);
+
+    if ( n != wxNOT_FOUND )
+    {
+        if ( HasClientObjectData() )
+            event.SetClientObject(GetClientObject(n));
+        else if ( HasClientUntypedData() )
+            event.SetClientData(GetClientData(n));
+    }
+}
+
+wxControlWithItems::~wxControlWithItems()
+{
+    // this destructor is required for Darwin
+}
+

 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS