fixed outdated filenames

[wxWidgets.git] / include / wx / univ / combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index e37418390a58adaab0c745d7a2e5208c2f5f183b..afccb74711596ff55e8d14c137a155692e192c8c 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -37,7 +37,7 @@
 #define _WX_UNIV_COMBOBOX_H_
 
 #ifdef __GNUG__
 #define _WX_UNIV_COMBOBOX_H_
 
 #ifdef __GNUG__

-    #pragma implementation "univcombobox.h"
+    #pragma interface "univcombobox.h"

 #endif
 
 class WXDLLEXPORT wxComboControl;
 #endif
 
 class WXDLLEXPORT wxComboControl;


@@ -270,9 +270,58 @@ public:
     virtual void Select(int n);
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }
     virtual void Select(int n);
     virtual int GetSelection() const;
     void SetSelection(int n) { Select(n); }

-    
+

     void SetStringSelection(const wxString& s) {  }
 
     void SetStringSelection(const wxString& s) {  }
 

+    // we have to redefine these functions here to avoid ambiguities in classes
+    // deriving from us which would arise otherwise because we inherit these
+    // methods (with different signatures) from both wxItemContainer via
+    // wxComboBoxBase (with "int n" parameter) and from wxEvtHandler via
+    // wxControl and wxComboControl (without)
+    //
+    // hopefully, a smart compiler can optimize away these simple inline
+    // wrappers so we don't suffer much from this
+
+    void SetClientData(void *data)
+    {
+        wxControl::SetClientData(data);
+    }
+
+    void *GetClientData() const
+    {
+        return wxControl::GetClientData();
+    }
+
+    void SetClientObject(wxClientData *data)
+    {
+        wxControl::SetClientObject(data);
+    }
+
+    wxClientData *GetClientObject() const
+    {
+        return wxControl::GetClientObject();
+    }
+
+    void SetClientData(int n, void* clientData)
+    {
+        wxItemContainer::SetClientData(n, clientData);
+    }
+
+    void* GetClientData(int n) const
+    {
+        return wxItemContainer::GetClientData(n);
+    }
+
+    void SetClientObject(int n, wxClientData* clientData)
+    {
+        wxItemContainer::SetClientObject(n, clientData);
+    }
+
+    wxClientData* GetClientObject(int n) const
+    {
+        return wxItemContainer::GetClientObject(n);
+    }
+

 protected:
     virtual int DoAppend(const wxString& item);
     virtual void DoSetItemClientData(int n, void* clientData);
 protected:
     virtual int DoAppend(const wxString& item);
     virtual void DoSetItemClientData(int n, void* clientData);