Fixes for GNUPro 00r1

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

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 09cff4de8e05af9b4161f7c523db88d84fe69fc7..1d8421d7287df0a26acfb06af9d7410fabebede1 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        common/ctrlsub.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        common/ctrlsub.cpp

-// Purpose:     wxControlWithItems implementation
+// Purpose:     wxItemContainer implementation

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99


@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CONTROLS
+

 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 #endif
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 #endif


@@ -40,7 +42,7 @@
 // selection
 // ----------------------------------------------------------------------------
 
 // selection
 // ----------------------------------------------------------------------------
 

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

 {
     wxString s;
     int sel = GetSelection();
 {
     wxString s;
     int sel = GetSelection();


@@ -54,41 +56,52 @@ wxString wxControlWithItems::GetStringSelection() const
 // client data
 // ----------------------------------------------------------------------------
 
 // client data
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
+    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,

                   wxT("can't have both object and void client data") );
 
                   wxT("can't have both object and void client data") );
 

-    wxClientData *clientDataOld = DoGetItemClientObject(n);
-    if ( clientDataOld )
-        delete clientDataOld;
+    // when we call SetClientObject() for the first time, m_clientDataItemsType
+    // is still wxClientData_None and so calling DoGetItemClientObject() would
+    // fail (in addition to being useless) - don't do it
+    if ( m_clientDataItemsType == wxClientData_Object )
+    {
+        wxClientData *clientDataOld = DoGetItemClientObject(n);
+        if ( clientDataOld )
+            delete clientDataOld;
+    }
+    else // m_clientDataItemsType == wxClientData_None
+    {
+        // now we have object client data
+        m_clientDataItemsType = wxClientData_Object;
+    }

 
     DoSetItemClientObject(n, data);
 
     DoSetItemClientObject(n, data);

-    m_clientDataItemsType = ClientData_Object;

 }
 
 }
 

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

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,

                   wxT("this window doesn't have object client data") );
 
     return DoGetItemClientObject(n);
 }
 
                   wxT("this window doesn't have object client data") );
 
     return DoGetItemClientObject(n);
 }
 

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

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
+    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,

                   wxT("can't have both object and void client data") );
 
     DoSetItemClientData(n, data);
                   wxT("can't have both object and void client data") );
 
     DoSetItemClientData(n, data);

-    m_clientDataItemsType = ClientData_Void;
+    m_clientDataItemsType = wxClientData_Void;

 }
 
 }
 

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

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,

                   wxT("this window doesn't have void client data") );
 
     return DoGetItemClientData(n);
 }
 
                   wxT("this window doesn't have void client data") );
 
     return DoGetItemClientData(n);
 }
 

+#endif // wxUSE_CONTROLS