don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 68980bf6b1755a961ef9f1d56b34404ae6c8ca1b..d0b5b2532c18253915b959cde6ce42dc2448ec1c 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -12,22 +12,19 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

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

 #pragma interface "combobox.h"
 #endif
 
 #include "wx/choice.h"
 
 #pragma interface "combobox.h"
 #endif
 
 #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)
         
 public:
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
         
 public:

-    inline wxComboBox() {}
+    wxComboBox() { m_inSetSelection = false; }

     ~wxComboBox();
     
     inline wxComboBox(wxWindow *parent, wxWindowID id,
     ~wxComboBox();
     
     inline wxComboBox(wxWindow *parent, wxWindowID id,


@@ -39,7 +36,23 @@ public:
         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);
+        m_inSetSelection = false;
+        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,
     }
     
     bool Create(wxWindow *parent, wxWindowID id,


@@ -51,18 +64,26 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr);
     
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr);
     

-    // List functions
-    virtual void Append(const wxString& item);
+    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);
+    virtual int DoInsert(const wxString& item, int pos);

     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 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);
-    virtual inline int Number() const { return m_noStrings; }
-    
+    virtual void SetString(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);


@@ -86,11 +107,19 @@ public:
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_mainWidget; }
     WXWidget GetMainWidget() const { return m_mainWidget; }
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_mainWidget; }
     WXWidget GetMainWidget() const { return m_mainWidget; }

-    
+
+    virtual wxSize DoGetBestSize() const;

 protected:
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
 protected:
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);

+private:
+    // only implemented for native combo box
+    void AdjustDropDownListSize();
+
+    // implementation detail, should really be private
+public:
+    bool m_inSetSelection;

 };
 
 #endif
 };
 
 #endif