SetTextColour is gone

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 618756c3452488e96a8a053f5a44994241e6ec25..e47a4e8b64698475479d6b8e55454d8e2507eb9d 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -1,35 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/motif/combobox.h

 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#ifdef __GNUG__
-#pragma interface "combobox.h"
-#endif
-

 #include "wx/choice.h"
 
 #include "wx/choice.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-

 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)

-        
+

 public:
 public:

-    wxComboBox() {}
-    ~wxComboBox();
-    
+    wxComboBox() { m_inSetSelection = false; }
+    virtual ~wxComboBox();
+

     inline wxComboBox(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
     inline wxComboBox(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,


@@ -39,10 +32,25 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr)
     {
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr)
     {

+        m_inSetSelection = false;

         Create(parent, id, value, pos, size, n, choices,
                style, validator, name);
     }
         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)
+    {
+        m_inSetSelection = false;
+        Create(parent, id, value, pos, size, choices,
+               style, validator, name);
+    }
+

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


@@ -51,21 +59,31 @@ public:
         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);
+

     // implementation of wxControlWithItems
     virtual int DoAppend(const wxString& item);
     // implementation of wxControlWithItems
     virtual int DoAppend(const wxString& item);

-    virtual void Delete(int n);
+    virtual int DoInsert(const wxString& item, unsigned int pos);
+    virtual void Delete(unsigned int n);

     virtual void Clear();
     virtual int GetSelection() const ;
     virtual void SetSelection(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 void SetString(int n, const wxString& s);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual wxString GetString(unsigned int n) const ;
+    virtual void SetString(unsigned int n, const wxString& s);

 
     // Text field functions
     virtual wxString GetValue() const ;
     virtual void SetValue(const wxString& value);
 
     // Text field functions
     virtual wxString GetValue() const ;
     virtual void SetValue(const wxString& value);

-    
+

     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();


@@ -73,14 +91,14 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const ;
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const ;

-    virtual long GetLastPosition() 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);

-    
+

     // Implementation
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_mainWidget; }
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_mainWidget; }


@@ -94,6 +112,10 @@ protected:
 private:
     // only implemented for native combo box
     void AdjustDropDownListSize();
 private:
     // only implemented for native combo box
     void AdjustDropDownListSize();

+
+    // implementation detail, should really be private
+public:
+    bool m_inSetSelection;

 };
 
 #endif
 };
 
 #endif