projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new wxStringTokenizer
[wxWidgets.git]
/
src
/
os2
/
scrolbar.cpp
diff --git
a/src/os2/scrolbar.cpp
b/src/os2/scrolbar.cpp
index 00225e72ed4d6947e6edc03909d302cabf3fe791..e77bcbdb26b19e97df9d23d8f7db9f9b7dad6f79 100644
(file)
--- a/
src/os2/scrolbar.cpp
+++ b/
src/os2/scrolbar.cpp
@@
-20,7
+20,6
@@
#include "wx/scrolbar.h"
#include "wx/os2/private.h"
#include "wx/scrolbar.h"
#include "wx/os2/private.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
@@
-29,20
+28,23
@@
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
#endif
END_EVENT_TABLE()
#endif
END_EVENT_TABLE()
-#endif
// Scrollbar
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size, long style,
// Scrollbar
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size, long style,
+#if wxUSE_VALIDATORS
const wxValidator& validator,
const wxValidator& validator,
+#endif
const wxString& name)
{
if (!parent)
return FALSE;
parent->AddChild(this);
SetName(name);
const wxString& name)
{
if (!parent)
return FALSE;
parent->AddChild(this);
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
SetValidator(validator);
+#endif
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;