projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added chapter on collection and container classes to contents
[wxWidgets.git]
/
src
/
os2
/
listbox.cpp
diff --git
a/src/os2/listbox.cpp
b/src/os2/listbox.cpp
index a6909e537fe32b1f5b2f07941ba90ce7a35f306a..2ecb09a5eb944a05685643aa4281473479bd34dc 100644
(file)
--- a/
src/os2/listbox.cpp
+++ b/
src/os2/listbox.cpp
@@
-34,9
+34,7
@@
#include "wx/ownerdrw.h"
#endif
#include "wx/ownerdrw.h"
#endif
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
// ============================================================================
// list box item declaration and implementation
// ============================================================================
// list box item declaration and implementation
@@
-80,7
+78,9
@@
bool wxListBox::Create(wxWindow *parent,
const wxSize& size,
int n, const wxString choices[],
long style,
const wxSize& size,
int n, const wxString choices[],
long style,
+#if wxUSE_VALIDATORS
const wxValidator& validator,
const wxValidator& validator,
+#endif
const wxString& name)
{
m_noItems = 0;
const wxString& name)
{
m_noItems = 0;
@@
-88,7
+88,9
@@
bool wxListBox::Create(wxWindow *parent,
m_selected = 0;
SetName(name);
m_selected = 0;
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
SetValidator(validator);
+#endif
if (parent)
parent->AddChild(this);
if (parent)
parent->AddChild(this);
@@
-602,7
+604,7
@@
void wxListBox::SetHorizontalExtent(const wxString& s)
*/
}
*/
}
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize()
const
{
// find the widest string
int wLine;
{
// find the widest string
int wLine;
@@
-622,7
+624,7
@@
wxSize wxListBox::DoGetBestSize()
// the listbox should be slightly larger than the widest string
int cx, cy;
// the listbox should be slightly larger than the widest string
int cx, cy;
- wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+ wxGetCharSize(GetHWND(), &cx, &cy,
(wxFont*)
&GetFont());
wListbox += 3*cx;
wListbox += 3*cx;
@@
-701,7
+703,7
@@
WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
backgroundBrush->RealizeResource();
return (WXHBRUSH) backgroundBrush->GetResourceHandle();
*/
backgroundBrush->RealizeResource();
return (WXHBRUSH) backgroundBrush->GetResourceHandle();
*/
- re
utrn (WX
BRUSH)0;
+ re
turn (WXH
BRUSH)0;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------