fixed suppressing of wxFontMapper questions which was broken by GUI/base separation...

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b8b6fc8435018c1713fd022b6727055cbce5ad28..4c122a19045fbb603486845e89a211a0afc1ad63 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -41,6 +41,7 @@
     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #endif
 

+#include "wx/tooltip.h"

 #include "wx/popupwin.h"
 
 #include "wx/univ/renderer.h"
 #include "wx/popupwin.h"
 
 #include "wx/univ/renderer.h"


@@ -55,6 +56,12 @@
    3. which passes them to the popup window if it is popped up
  */
 
    3. which passes them to the popup window if it is popped up
  */
 

+// constants
+// ----------------------------------------------------------------------------
+
+// the margin between the text control and the combo button
+static const wxCoord g_comboMargin = 2;
+

 // ----------------------------------------------------------------------------
 // wxComboButton is just a normal button except that it sends commands to the
 // combobox and not its parent
 // ----------------------------------------------------------------------------
 // wxComboButton is just a normal button except that it sends commands to the
 // combobox and not its parent


@@ -118,6 +125,7 @@ public:
     virtual bool SetSelection(const wxString& value);
     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual bool SetSelection(const wxString& value);
     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


@@ -193,7 +201,7 @@ BEGIN_EVENT_TABLE(wxComboTextCtrl, wxTextCtrl)
     EVT_TEXT(-1, wxComboTextCtrl::OnText)
 END_EVENT_TABLE()
 
     EVT_TEXT(-1, wxComboTextCtrl::OnText)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -293,8 +301,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;
+
+    if (m_popup)
+    {
+        widthPopup = m_popup->GetBestWidth();
+    }

 
 

-    return wxSize(sizeBtn.x + sizeText.x, wxMax(sizeBtn.y, sizeText.y));
+    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)


@@ -345,6 +360,29 @@ bool wxComboControl::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#if wxUSE_TOOLTIPS
+void wxComboControl::DoSetToolTip(wxToolTip *tooltip)
+{
+    wxControl::DoSetToolTip(tooltip);    
+
+    // Set tool tip for button and text box
+    if (m_text && m_btn)
+    {
+        if (tooltip)
+        {
+            const wxString &tip = tooltip->GetTip();
+            m_text->SetToolTip(tip);
+            m_btn->SetToolTip(tip);
+        }
+        else
+        {
+            m_text->SetToolTip(NULL);
+            m_btn->SetToolTip(NULL);
+        }
+    }
+}
+#endif // wxUSE_TOOLTIPS
+

 // ----------------------------------------------------------------------------
 // popup window handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // popup window handling
 // ----------------------------------------------------------------------------


@@ -585,6 +623,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


@@ -718,10 +762,16 @@ void wxComboBox::SetEditable(bool editable)
 void wxComboBox::Clear()
 {
     GetLBox()->Clear();
 void wxComboBox::Clear()
 {
     GetLBox()->Clear();

+    GetText()->SetValue(wxEmptyString);

 }
 
 void wxComboBox::Delete(int n)
 {
 }
 
 void wxComboBox::Delete(int n)
 {

+    wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Delete") );
+
+    if (GetSelection() == n)
+        GetText()->SetValue(wxEmptyString);
+

     GetLBox()->Delete(n);
 }
 
     GetLBox()->Delete(n);
 }
 


@@ -732,11 +782,15 @@ int wxComboBox::GetCount() const
 
 wxString wxComboBox::GetString(int n) const
 {
 
 wxString wxComboBox::GetString(int n) const
 {

+    wxCHECK_MSG( (n >= 0) && (n < GetCount()), wxEmptyString, _T("invalid index in wxComboBox::GetString") );
+

     return GetLBox()->GetString(n);
 }
 
 void wxComboBox::SetString(int n, const wxString& s)
 {
     return GetLBox()->GetString(n);
 }
 
 void wxComboBox::SetString(int n, const wxString& s)
 {

+    wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::SetString") );
+

     GetLBox()->SetString(n, s);
 }
 
     GetLBox()->SetString(n, s);
 }
 


@@ -747,7 +801,7 @@ int wxComboBox::FindString(const wxString& s) const
 
 void wxComboBox::Select(int n)
 {
 
 void wxComboBox::Select(int n)
 {

-    wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid combobox index") );
+    wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );

 
     GetLBox()->SetSelection(n);
     GetText()->SetValue(GetLBox()->GetString(n));
 
     GetLBox()->SetSelection(n);
     GetText()->SetValue(GetLBox()->GetString(n));


@@ -755,8 +809,15 @@ void wxComboBox::Select(int n)
 
 int wxComboBox::GetSelection() const
 {
 
 int wxComboBox::GetSelection() const
 {

+#if 1 // FIXME:: What is the correct behavior?

     // if the current value isn't one of the listbox strings, return -1
     // if the current value isn't one of the listbox strings, return -1

+    return GetLBox()->GetSelection();
+#else    
+    // Why oh why is this done this way? 
+    // It is not because the value displayed in the text can be found 
+    // in the list that it is the item that is selected!

     return FindString(GetText()->GetValue());
     return FindString(GetText()->GetValue());

+#endif

 }
 
 int wxComboBox::DoAppend(const wxString& item)
 }
 
 int wxComboBox::DoAppend(const wxString& item)


@@ -764,6 +825,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);