Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.

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

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index a70341e7f63ed0aefa6ca2f134bf74dff0ce950e..e07db8a96251f2a463f3fe3078e7dec07660db5b 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

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

 #pragma interface "combobox.h"
 #endif
 
 #pragma interface "combobox.h"
 #endif
 


@@ -20,15 +20,14 @@
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 // Combobox item
 
 // Combobox item

-class WXDLLEXPORT wxComboBox: public wxChoice
+class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase

 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
  public:

-  inline wxComboBox() {}
+    inline wxComboBox() {}

     virtual ~wxComboBox();
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual ~wxComboBox();
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;


@@ -43,7 +42,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
     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,
+    inline 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,


@@ -51,11 +50,11 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)

-  {
+    {

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

-  }
+    }

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(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,


@@ -64,36 +63,49 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 

-  // List functions
-  virtual void Append(const wxString& item);
-  virtual void Delete(int n);
-  virtual void Clear();
-  virtual int GetSelection() const ;
-  virtual void SetSelection(int n);
-  virtual int FindString(const wxString& s) const;
-  virtual wxString GetString(int n) const ;
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& sel);
-  
-  // Text field functions
-  virtual wxString GetValue() const ;
-  virtual void SetValue(const wxString& value);
-
-  // Clipboard operations
-  virtual void Copy();
-  virtual void Cut();
-  virtual void Paste();
-  virtual void SetInsertionPoint(long pos);
-  virtual void SetInsertionPointEnd();
-  virtual long GetInsertionPoint() const ;
-  virtual long 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 int GetCount() const { return m_choice->GetCount() ; }
-  void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    // List functions
+    virtual void Delete(int n);
+    virtual void Clear();
+
+    virtual int GetSelection() const ;
+    virtual void SetSelection(int n);
+    virtual void Select(int n) { SetSelection(n) ; }
+    virtual int FindString(const wxString& s) const;
+    virtual wxString GetString(int n) const ;
+    virtual wxString GetStringSelection() const ;
+    virtual void SetString(int n, const wxString& s) ;
+    virtual bool SetStringSelection(const wxString& sel);
+
+    // Text field functions
+    virtual wxString GetValue() const ;
+    virtual void SetValue(const wxString& value);
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const ;
+    virtual long 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 int GetCount() const { return m_choice->GetCount() ; }
+    void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+
+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
+

 protected:
 protected:

+    virtual int DoAppend(const wxString& item) ;
+    virtual int DoInsert(const wxString& item, 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 ;
+

     // the subcontrols
     wxTextCtrl*     m_text;
     wxChoice*       m_choice;
     // the subcontrols
     wxTextCtrl*     m_text;
     wxChoice*       m_choice;