make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 9f5dfeade9af6fa7c78533b0877ebacea7efd1de..d090aafd74983c17f998dd4f2dd0ef1cdc4accb0 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "choicebase.h"
 #endif
 
     #pragma implementation "choicebase.h"
 #endif
 


@@ -28,90 +28,45 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CHOICE
+

 #ifndef WX_PRECOMP
     #include "wx/choice.h"
 #ifndef WX_PRECOMP
     #include "wx/choice.h"

-    #include "wx/log.h"

 #endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 #endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-void wxChoiceBase::Command(wxCommandEvent &event)
+wxChoiceBase::~wxChoiceBase()

 {
 {

-    SetSelection(event.GetInt());
-    (void)ProcessEvent(event);
+    // this destructor is required for Darwin

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// string selection management
+// selection

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxString wxChoiceBase::GetStringSelection() const
+bool wxChoiceBase::SetStringSelection(const wxString& s)

 {
 {

-    int sel = GetSelection();
-    wxString str;
-    wxCHECK_MSG( sel != wxNOT_FOUND, str, _T("no selection, hence no string") );
+    int sel = FindString(s);
+    wxCHECK_MSG( sel != -1, false,
+                 wxT("invalid string in wxChoice::SetStringSelection") );

 
 

-    str = GetString(sel);
-    return str;
-}
+    Select(sel);

 
 

-bool wxChoiceBase::SetStringSelection(const wxString& sel)
-{
-    int selIndex = FindString(sel);
-    wxCHECK_MSG( selIndex != wxNOT_FOUND, FALSE,
-                 _T("can't set selection to string not in the control") );
-
-    SetSelection(selIndex);
-
-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// client data
+// misc

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxChoiceBase::SetClientObject(int n, wxClientData *data)
-{
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
-                  _T("can't have both object and void client data") );
-
-    wxClientData *clientDataOld = DoGetClientObject(n);
-    if ( clientDataOld )
-        delete clientDataOld;
-
-    DoSetClientObject(n, data);
-    m_clientDataItemsType = ClientData_Object;
-}
-
-wxClientData *wxChoiceBase::GetClientObject(int n) const
+void wxChoiceBase::Command(wxCommandEvent& event)

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
-                  _T("this window doesn't have object client data") );
-
-    return DoGetClientObject(n);
-}
-
-void wxChoiceBase::SetClientData(int n, void *data)
-{
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
-                  _T("can't have both object and void client data") );
-
-    DoSetClientData(n, data);
-    m_clientDataItemsType = ClientData_Void;
-}
-
-void *wxChoiceBase::GetClientData(int n) const
-{
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
-                  _T("this window doesn't have void client data") );
-
-    return DoGetClientData(n);
+    SetSelection(event.GetInt());
+    (void)ProcessEvent(event);

 }
 
 }
 

+#endif // wxUSE_CHOICE