projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable some wxWebView tests that fail on the buildbot but not locally.
[wxWidgets.git]
/
src
/
osx
/
cocoa
/
slider.mm
diff --git
a/src/osx/cocoa/slider.mm
b/src/osx/cocoa/slider.mm
index fbde6dc22a2f1b777e8047a8a26936526107ff2d..3bab4cc06adb58cec97cca0ce3da44a0ed277947 100644
(file)
--- a/
src/osx/cocoa/slider.mm
+++ b/
src/osx/cocoa/slider.mm
@@
-4,7
+4,7
@@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id
: slider.cpp 54129 2008-06-11 19:30:52Z SC
$
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-90,6
+90,13
@@
wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
long WXUNUSED(extraStyle))
{
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
long WXUNUSED(extraStyle))
{
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+ if ( size == wxDefaultSize )
+ {
+ if ( style & wxSL_VERTICAL )
+ r.size.height = r.size.width * 2;
+ else
+ r.size.width = r.size.height * 2;
+ }
wxNSSlider* v = [[wxNSSlider alloc] initWithFrame:r];
int tickMarks = 0;
wxNSSlider* v = [[wxNSSlider alloc] initWithFrame:r];
int tickMarks = 0;