projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[wxWidgets.git]
/
src
/
mac
/
scrolbar.cpp
diff --git
a/src/mac/scrolbar.cpp
b/src/mac/scrolbar.cpp
index a432b3e9b122d7542304fc72e50333712a16c4c8..2db4a175bb25a42339c81534f792deb339ef20f5 100644
(file)
--- a/
src/mac/scrolbar.cpp
+++ b/
src/mac/scrolbar.cpp
@@
-16,13
+16,11
@@
#include "wx/scrolbar.h"
#include "wx/mac/uma.h"
#include "wx/scrolbar.h"
#include "wx/mac/uma.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
END_EVENT_TABLE()
-#endif
extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
@@
-152,6
+150,13
@@
void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
}
event.SetPosition(new_pos);
event.SetEventObject( this );
}
event.SetPosition(new_pos);
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ wxWindow* window = GetParent() ;
+ if (window && window->MacIsWindowScrollbar(this) )
+ {
+ // this is hardcoded
+ window->MacOnScroll(event);
+ }
+ else
+ GetEventHandler()->ProcessEvent(event);
}
}