carbon cfm fixes

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 5b8046a4a55cb09e8894203986b3da3bce5adc71..c4c7bf3d891bf523729f06389ab778a958419492 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -12,13 +12,15 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 

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

 #pragma interface "combobox.h"
 #endif
 
 #include "wx/defs.h"
 #pragma interface "combobox.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_COMBOBOX
+

 #include "wx/object.h"
 #include "wx/object.h"

-#include "wx/control.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -30,21 +32,18 @@ class wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char* wxComboBoxNameStr;
-extern const char* wxEmptyString;
+extern const wxChar* wxComboBoxNameStr;
+extern const wxChar* wxEmptyString;

 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxComboBox)
-
- public:
-  inline wxComboBox(void) {}
-
-  inline wxComboBox(wxWindow *parent, wxWindowID id,
+public:
+    inline wxComboBox() {}
+    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,


@@ -52,10 +51,24 @@ class wxComboBox: public wxControl
            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);
-  }
-  bool Create(wxWindow *parent, wxWindowID id,
+    {
+        Create(parent, id, value, pos, size, n, choices, style, validator, name);
+    }
+    inline wxComboBox(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxComboBoxNameStr)
+    {
+        Create(parent, id, value, pos, size, choices, style, validator, name);
+    }
+
+    ~wxComboBox();
+
+    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,


@@ -63,52 +76,89 @@ class wxComboBox: public wxControl
            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,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxComboBoxNameStr);

 
 

-  void Clear(void);
-  void Append( const wxString &item );
-  void Append( const wxString &item, char* clientData );
-  void Delete( int n );
-  int FindString( const wxString &item );
-  char* GetClientData( int n );
-  void SetClientData( int n, char * clientData );
-  int GetSelection(void) const;
-  wxString GetString( int n ) const;
-  wxString GetStringSelection(void) const;
-  int Number(void) const;
-  void SetSelection( int n );
-  void SetStringSelection( const wxString &string );
-
-  wxString GetValue(void) const ;
-  void SetValue(const wxString& value);
-
-  void Copy(void);
-  void Cut(void);
-  void Paste(void);
-  void SetInsertionPoint(long pos);
-  void SetInsertionPointEnd(void);
-  long GetInsertionPoint(void) const ;
-  long GetLastPosition(void) const ;
-  void Replace(long from, long to, const wxString& value);
-  void Remove(long from, long to);
-  void SetSelection(long from, long to);
-  void SetEditable(bool editable);
-  
-  void SetFont( const wxFont &font );
-  void OnSize( wxSizeEvent &event );
-  void SetBackgroundColour( const wxColour &colour );
-  
-  // implementation
+    void Clear();
+    void Delete( int n );
+
+    virtual int FindString( const wxString &item ) const;
+    int GetSelection() const;
+    wxString GetString( int n ) const;
+    wxString GetStringSelection() const;
+    int GetCount() const;
+    int Number() const { return GetCount(); }
+    void SetSelection( int n );
+    void Select( int n ) { return SetSelection( n ); }
+    bool SetStringSelection( const wxString &string );
+    void SetString(int n, const wxString &text);
+
+    wxString GetValue() const;
+    void SetValue(const wxString& value);
+
+    void Copy();
+    void Cut();
+    void Paste();
+    void SetInsertionPoint( long pos );
+    void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
+    long GetInsertionPoint() const;
+    long GetLastPosition() const;
+    void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
+    void Replace( long from, long to, const wxString& value );
+    void SetSelection( long from, long to );
+    void SetEditable( bool editable );
+
+    // implementation
+
+    virtual void SetFocus();
+
+    void OnSize( wxSizeEvent &event );
+    void OnChar( wxKeyEvent &event );

 
     bool     m_alreadySent;
 
     bool     m_alreadySent;

+    wxList   m_clientDataList;
+    wxList   m_clientObjectList;
+    int      m_prevSelection;
+
+    void DisableEvents();
+    void EnableEvents();
+    GtkWidget* GetConnectWidget();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

     
     

-  private:
-  
-    wxList   m_clientData;
-
-  GtkWidget* GetConnectWidget(void);
-  bool IsOwnGtkWindow( GdkWindow *window );
-  
-  DECLARE_EVENT_TABLE()
+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;
+
+    virtual wxSize DoGetBestSize() const;
+
+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#endif // __GTKCOMBOBOXH__
+#endif
+
+#endif
+
+  // __GTKCOMBOBOXH__