fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

[wxWidgets.git] / include / wx / mac / carbon / combobox.h

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 510673b3802e0c3b4a5ec320fc3bb5e47d7a030a..c38095768dc6a5a7be00fbe18c07d8fd99c1885d 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -15,7 +15,7 @@
 #include "wx/containr.h"
 #include "wx/choice.h"
 
 #include "wx/containr.h"
 #include "wx/choice.h"
 

-WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[];

 
 // forward declaration of private implementation classes
 
 
 // forward declaration of private implementation classes
 


@@ -84,10 +84,6 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 

-    // List functions
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-

     virtual int GetSelection() const;
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;


@@ -127,6 +123,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 

+    virtual wxClientDataType GetClientDataType() const;
+

     wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
     wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST


@@ -137,6 +135,10 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // List functions
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+

     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);


@@ -148,7 +150,6 @@ protected:
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void * DoGetItemClientData(unsigned int n) const;
 
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void * DoGetItemClientData(unsigned int n) const;
 

-    virtual wxClientDataType GetClientDataType() const;

     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
     // the subcontrols
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
     // the subcontrols