X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687706f5e722ac8a39172024f794ae0ffbd190e2..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/combobox.cpp?ds=sidebyside diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index 01ed1c3816..063cb93c68 100644 --- a/src/motif/combobox.cpp +++ b/src/motif/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/motif/combobox.cpp // Purpose: wxComboBox class // Author: Julian Smart // Modified by: @@ -9,15 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "combobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_COMBOBOX #include "wx/combobox.h" @@ -53,7 +47,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& name) { if( !CreateControl( parent, id, pos, size, style, validator, name ) ) - return FALSE; + return false; m_noStrings = n; @@ -83,7 +77,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, SetValue(value); - ChangeFont(FALSE); + ChangeFont(false); XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback, (XtPointer) this); @@ -94,7 +88,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, ChangeBackgroundColour(); - return TRUE; + return true; } bool wxComboBox::Create(wxWindow *parent, wxWindowID id, @@ -107,7 +101,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& name) { wxCArrayString chs(choices); - return Create(parent, id, value, pos, size, chs.GetCount(), + return Create(parent, id, value, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name); } @@ -120,7 +114,9 @@ wxComboBox::~wxComboBox() m_clientDataDict.DestroyData(); } -void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) +void wxComboBox::DoSetSize(int x, int y, + int width, int WXUNUSED(height), + int sizeFlags) { // Necessary so it doesn't call wxChoice::SetSize wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags); @@ -141,14 +137,14 @@ wxString wxComboBox::GetValue() const void wxComboBox::SetValue(const wxString& value) { - m_inSetValue = TRUE; + m_inSetValue = true; if( !value.empty() ) XmComboBoxSetString( (Widget)m_mainWidget, wxConstCast(value.c_str(), char) ); - m_inSetValue = FALSE; + m_inSetValue = false; } -void wxComboBox::SetString(int n, const wxString& s) +void wxComboBox::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s)) { wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") ); } @@ -226,8 +222,10 @@ wxString wxComboBox::GetString(int n) const return wxEmptyString; } -int wxComboBox::FindString(const wxString& s) const +int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const { + // FIXME: back to base class for not supported value of bCase + int *pos_list = NULL; int count = 0; wxXmString text( s ); @@ -241,7 +239,7 @@ int wxComboBox::FindString(const wxString& s) const return pos; } - return -1; + return wxNOT_FOUND; } // Clipboard operations @@ -281,9 +279,9 @@ long wxComboBox::GetInsertionPoint() const return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget); } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { - return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget); + return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget); } void wxComboBox::Replace(long from, long to, const wxString& value) @@ -324,7 +322,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, event.SetClientObject( item->GetClientObject(cbs->index - 1) ); else if ( item->HasClientUntypedData() ) event.SetClientData( item->GetClientData(cbs->index - 1) ); - event.SetExtraLong(TRUE); + event.SetExtraLong(true); event.SetEventObject(item); item->ProcessCommand (event); break; @@ -334,7 +332,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId()); event.SetInt(-1); event.SetString( item->GetValue() ); - event.SetExtraLong(TRUE); + event.SetExtraLong(true); event.SetEventObject(item); item->ProcessCommand (event); break;