projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor header cleaning.
[wxWidgets.git]
/
src
/
motif
/
combobox_native.cpp
diff --git
a/src/motif/combobox_native.cpp
b/src/motif/combobox_native.cpp
index e6672c200a5696214f2047f7f091fef1b2bfa614..107df40f0bf92fab9ec96389f7270b1a9eac5490 100644
(file)
--- a/
src/motif/combobox_native.cpp
+++ b/
src/motif/combobox_native.cpp
@@
-12,12
+12,13
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/setup.h"
-
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
@@
-115,8
+116,8
@@
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
(XtPointer) this);
wxSize best = GetBestSize();
(XtPointer) this);
wxSize best = GetBestSize();
- if( size.x !=
-1
) best.x = size.x;
- if( size.y !=
-1
) best.y = size.y;
+ if( size.x !=
wxDefaultCoord
) best.x = size.x;
+ if( size.y !=
wxDefaultCoord
) best.y = size.y;
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
@@
-181,7
+182,7
@@
wxString wxComboBox::GetValue() const
return str;
}
return str;
}
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(
unsigned
int n, const wxString& s)
{
wxXmString text(s);
Widget listBox = GetXmList(this);
{
wxXmString text(s);
Widget listBox = GetXmList(this);
@@
-215,10
+216,10
@@
int wxComboBox::DoAppend(const wxString& item)
return GetCount() - 1;
}
return GetCount() - 1;
}
-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);
@@
-231,7
+232,7
@@
int wxComboBox::DoInsert(const wxString& item, int pos)
return GetCount() - 1;
}
return GetCount() - 1;
}
-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(
unsigned
int n)
{
#ifdef LESSTIF_VERSION
XmListDeletePos (GetXmList(this), n + 1);
{
#ifdef LESSTIF_VERSION
XmListDeletePos (GetXmList(this), n + 1);
@@
-271,7
+272,7
@@
void wxComboBox::SetSelection (int n)
SetValue(GetString(n));
#else
#if 0
SetValue(GetString(n));
#else
#if 0
- wxXmString str(
GetString(n).c_str()
);
+ wxXmString str(
GetString(n).c_str()
);
XmComboBoxSelectItem((Widget) m_mainWidget, str());
#endif
XtVaSetValues( (Widget)m_mainWidget,
XmComboBoxSelectItem((Widget) m_mainWidget, str());
#endif
XtVaSetValues( (Widget)m_mainWidget,
@@
-287,7
+288,7
@@
int wxComboBox::GetSelection (void) const
return wxDoGetSelectionInList( GetXmList( this ) );
}
return wxDoGetSelectionInList( GetXmList( this ) );
}
-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(
unsigned
int n) const
{
return wxDoGetStringInList( GetXmList(this), n );
}
{
return wxDoGetStringInList( GetXmList(this), n );
}