really disable wxUSE_DISPLAY for wxMGL and wxOS2

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index ba970585eda85e72e7d86ba37579e72d2e82248f..c785a83a7f35f901ae902e99203d59ead9cb8666 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -127,6 +127,11 @@ public:
     virtual void SetSelection(int n) { DoSetSelection(n, true); }
     void SetSelection(int n, bool select) { DoSetSelection(n, select); }
 
     virtual void SetSelection(int n) { DoSetSelection(n, true); }
     void SetSelection(int n, bool select) { DoSetSelection(n, select); }
 

+    // used to process wxUniv actions
+    bool PerformAction(const wxControlAction& action,
+                       long numArg,
+                       const wxString& strArg);
+

 protected:
     // we shouldn't return height too big from here
     virtual wxSize DoGetBestClientSize() const;
 protected:
     // we shouldn't return height too big from here
     virtual wxSize DoGetBestClientSize() const;


@@ -140,11 +145,6 @@ protected:
     // called whenever the user selects or activates a listbox item
     void OnSelect(wxCommandEvent& event);
 
     // called whenever the user selects or activates a listbox item
     void OnSelect(wxCommandEvent& event);
 

-    // used to process wxUniv actions
-    bool PerformAction(const wxControlAction& action,
-                       long numArg,
-                       const wxString& strArg);
-

 private:
     // has the mouse been released on this control?
     bool m_clicked;
 private:
     // has the mouse been released on this control?
     bool m_clicked;


@@ -506,8 +506,6 @@ void wxComboTextCtrl::OnKey(wxKeyEvent& event)
         case WXK_ESCAPE:
         case WXK_PAGEDOWN:
         case WXK_PAGEUP:
         case WXK_ESCAPE:
         case WXK_PAGEDOWN:
         case WXK_PAGEUP:

-        case WXK_PRIOR:
-        case WXK_NEXT:

             (void)m_combo->ProcessEvent(event);
             return;
     }
             (void)m_combo->ProcessEvent(event);
             return;
     }


@@ -540,7 +538,7 @@ bool wxComboListBox::SetSelection(const wxString& value)
     // always matches), but we want to show the first one in such case
     if ( value.empty() )
     {
     // always matches), but we want to show the first one in such case
     if ( value.empty() )
     {

-        if ( GetCount() )
+        if ( GetCount() > 0 )

         {
             wxListBox::SetSelection(0);
         }
         {
             wxListBox::SetSelection(0);
         }


@@ -796,31 +794,31 @@ void wxComboBox::Clear()
     GetText()->SetValue(wxEmptyString);
 }
 
     GetText()->SetValue(wxEmptyString);
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)

 {
 {

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

 
 

-    if (GetSelection() == n)
+    if (GetSelection() == (int)n)

         GetText()->SetValue(wxEmptyString);
 
     GetLBox()->Delete(n);
 }
 
         GetText()->SetValue(wxEmptyString);
 
     GetLBox()->Delete(n);
 }
 

-int wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const

 {
     return GetLBox()->GetCount();
 }
 
 {
     return GetLBox()->GetCount();
 }
 

-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
 {

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

 
     return GetLBox()->GetString(n);
 }
 
 
     return GetLBox()->GetString(n);
 }
 

-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)

 {
 {

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

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


@@ -832,7 +830,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
 
 void wxComboBox::SetSelection(int n)
 {
 
 void wxComboBox::SetSelection(int n)
 {

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

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


@@ -856,10 +854,10 @@ int wxComboBox::DoAppend(const wxString& item)
     return GetLBox()->Append(item);
 }
 
     return GetLBox()->Append(item);
 }
 

-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)

 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));

-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));

 
     if (pos == GetCount())
         return DoAppend(item);
 
     if (pos == GetCount())
         return DoAppend(item);


@@ -868,22 +866,22 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
     return pos;
 }
 
     return pos;
 }
 

-void wxComboBox::DoSetItemClientData(int n, void* clientData)
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
     GetLBox()->SetClientData(n, clientData);
 }
 
 {
     GetLBox()->SetClientData(n, clientData);
 }
 

-void *wxComboBox::DoGetItemClientData(int n) const
+void *wxComboBox::DoGetItemClientData(unsigned int n) const

 {
     return GetLBox()->GetClientData(n);
 }
 
 {
     return GetLBox()->GetClientData(n);
 }
 

-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
     GetLBox()->SetClientObject(n, clientData);
 }
 
 {
     GetLBox()->SetClientObject(n, clientData);
 }
 

-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const

 {
     return GetLBox()->GetClientObject(n);
 }
 {
     return GetLBox()->GetClientObject(n);
 }