Fixed notebook redraw problems when using XP theme with Classic appearance.

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 74b01d41744853c650f1f3d4d02c479c7179f396..a61d580100093ee92c3012755ae185ffa50405ba 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "univcombobox.h"
 #endif
 
     #pragma implementation "univcombobox.h"
 #endif
 


@@ -93,7 +93,7 @@ public:
     }
 
 protected:
     }
 
 protected:

-    void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); }
+    void OnButton(wxCommandEvent& WXUNUSED(event)) { m_combo->ShowPopup(); }

 
     virtual wxSize DoGetBestClientSize() const
     {
 
     virtual wxSize DoGetBestClientSize() const
     {


@@ -123,8 +123,11 @@ public:
 
     // implement wxComboPopup methods
     virtual bool SetSelection(const wxString& value);
 
     // implement wxComboPopup methods
     virtual bool SetSelection(const wxString& value);

+    virtual void SetSelection(int n, bool select)
+        { wxListBox::SetSelection( n, select); };

     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();

+    virtual wxCoord GetBestWidth() const;

 
 protected:
     // we shouldn't return height too big from here
 
 protected:
     // we shouldn't return height too big from here


@@ -289,7 +292,7 @@ wxComboControl::~wxComboControl()
 // ----------------------------------------------------------------------------
 
 void wxComboControl::DoSetSize(int x, int y,
 // ----------------------------------------------------------------------------
 
 void wxComboControl::DoSetSize(int x, int y,

-                               int width, int height,
+                               int width, int WXUNUSED(height),

                                int sizeFlags)
 {
     // combo height is always fixed
                                int sizeFlags)
 {
     // combo height is always fixed


@@ -300,8 +303,15 @@ wxSize wxComboControl::DoGetBestClientSize() const
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();

+    wxCoord widthPopup = 0;

 
 

-    return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y));
+    if (m_popup)
+    {
+        widthPopup = m_popup->GetBestWidth();
+    }
+
+    return wxSize(wxMax(sizeText.x + g_comboMargin + sizeBtn.x, widthPopup), 
+                  wxMax(sizeBtn.y, sizeText.y));

 }
 
 void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxComboControl::DoMoveWindow(int x, int y, int width, int height)


@@ -615,6 +625,12 @@ void wxComboListBox::OnMouseMove(wxMouseEvent& event)
     }
 }
 
     }
 }
 

+wxCoord wxComboListBox::GetBestWidth() const
+{
+    wxSize size = wxListBox::GetBestSize();
+    return size.x;
+}
+

 wxSize wxComboListBox::DoGetBestClientSize() const
 {
     // don't return size too big or we risk to not fit on the screen
 wxSize wxComboListBox::DoGetBestClientSize() const
 {
     // don't return size too big or we risk to not fit on the screen


@@ -811,6 +827,18 @@ int wxComboBox::DoAppend(const wxString& item)
     return GetLBox()->Append(item);
 }
 
     return GetLBox()->Append(item);
 }
 

+int wxComboBox::DoInsert(const wxString& item, int pos)
+{
+    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+
+    if (pos == GetCount())
+        return DoAppend(item);
+
+    GetLBox()->Insert(item, pos);
+    return pos;
+}
+

 void wxComboBox::DoSetItemClientData(int n, void* clientData)
 {
     GetLBox()->SetClientData(n, clientData);
 void wxComboBox::DoSetItemClientData(int n, void* clientData)
 {
     GetLBox()->SetClientData(n, clientData);