(blind) compilation fixes after latest changes

[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 4ad1e4846a18d4134ae8b1bde9f6f9e8067ea624..446b4b14a5e73cbe4f6e920fd7cad05a8967e084 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -12,22 +12,22 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

+#include "wx/containr.h"

 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
 
 // forward declaration of private implementation classes
 
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
 
 // forward declaration of private implementation classes
 

-class wxComboBoxText ;
-class wxComboBoxChoice ;
+class wxComboBoxText;
+class wxComboBoxChoice;

 
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 {
 
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 {

-  DECLARE_DYNAMIC_CLASS(wxComboBox)
+    DECLARE_DYNAMIC_CLASS(wxComboBox)

 
  public:
 
  public:

-    wxComboBox() ;

     virtual ~wxComboBox();
 
     // forward these functions to all subcontrols
     virtual ~wxComboBox();
 
     // forward these functions to all subcontrols


@@ -38,7 +38,9 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual void DelegateTextChanged( const wxString& value );
     virtual void DelegateChoice( const wxString& value );
 
     virtual void DelegateTextChanged( const wxString& value );
     virtual void DelegateChoice( const wxString& value );
 

-    inline wxComboBox(wxWindow *parent, wxWindowID id,
+    wxComboBox() { Init(); }
+
+    wxComboBox(wxWindow *parent, wxWindowID id,

            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -47,9 +49,11 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {

-    Create(parent, id, value, pos, size, n, choices, style, validator, name);
+        Init();
+        Create(parent, id, value, pos, size, n, choices, style, validator, name);

     }
     }

-    inline wxComboBox(wxWindow *parent, wxWindowID id,
+
+    wxComboBox(wxWindow *parent, wxWindowID id,

            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,


@@ -58,7 +62,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {

-    Create(parent, id, value, pos, size, choices, style, validator, name);
+        Init();
+        Create(parent, id, value, pos, size, choices, style, validator, name);

     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     }
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -69,6 +74,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);

+

     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,


@@ -79,19 +85,18 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxString& name = wxComboBoxNameStr);
 
     // List functions
            const wxString& name = wxComboBoxNameStr);
 
     // List functions

-    virtual void Delete(int n);
+    virtual void Delete(unsigned int n);

     virtual void Clear();
 
     virtual void Clear();
 

-    virtual int GetSelection() const ;
-    int GetCurrentSelection() const { return GetSelection(); }
+    virtual int GetSelection() const;

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

-    virtual wxString GetString(int n) const ;
-    virtual wxString GetStringSelection() const ;
-    virtual void SetString(int n, const wxString& s) ;
+    virtual wxString GetString(unsigned int n) const;
+    virtual wxString GetStringSelection() const;
+    virtual void SetString(unsigned int n, const wxString& s);

 
     // Text field functions
 
     // Text field functions

-    virtual wxString GetValue() const ;
+    virtual wxString GetValue() const;

     virtual void SetValue(const wxString& value);
 
     // Clipboard operations
     virtual void SetValue(const wxString& value);
 
     // Clipboard operations


@@ -100,45 +105,49 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual void Paste();
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual void Paste();
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();

-    virtual long GetInsertionPoint() const ;
-    virtual wxTextPos GetLastPosition() const ;
+    virtual long GetInsertionPoint() const;
+    virtual wxTextPos GetLastPosition() const;

     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);

-    virtual int GetCount() const ;
+    virtual bool IsEditable() const;

 
 

-    virtual bool IsEditable() const ;
+    virtual unsigned int GetCount() const;

 
 

-    virtual void Undo() ;
-    virtual void Redo() ;
-    virtual void SelectAll() ;
+    virtual void Undo();
+    virtual void Redo();
+    virtual void SelectAll();

 
 

-    virtual bool CanCopy() const ;
-    virtual bool CanCut() const ;
-    virtual bool CanPaste() const ;
-    virtual bool CanUndo() const ;
-    virtual bool CanRedo() const ;
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;

 
 

-    wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
+    wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
     WX_DECLARE_CONTROL_CONTAINER();
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
     WX_DECLARE_CONTROL_CONTAINER();

+

 protected:
 protected:

+    // common part of all ctors
+    void Init();
+
+    void FreeData();
+

     // 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);
 

-    virtual int DoAppend(const wxString& item) ;
-    virtual int DoInsert(const wxString& item, int pos) ;
+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, unsigned int pos);

 
 

-    virtual void DoSetItemClientData(int n, void* clientData) ;
-    virtual void* DoGetItemClientData(int n) const ;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData) ;
-    virtual wxClientData* DoGetItemClientObject(int n) const ;
-
-    void FreeData();
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void * DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData * DoGetItemClientObject(unsigned int n) const;

 
     // the subcontrols
     wxComboBoxText*     m_text;
 
     // the subcontrols
     wxComboBoxText*     m_text;


@@ -147,5 +156,4 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-    // _WX_COMBOBOX_H_
+#endif // _WX_COMBOBOX_H_