changing to allow for 2x ramping up NSApp run

[wxWidgets.git] / src / osx / slider_osx.cpp

diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index dffe5eb2d2241bccf2e5d343a74206c0f9aedd7e..5d658fe181eb2b8081058b4622bd3fd2011e06e4 100644 (file)
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -57,9 +56,9 @@ bool wxSlider::Create(wxWindow *parent,
     const wxSize& size, long style,
     const wxValidator& validator,
     const wxString& name)
     const wxSize& size, long style,
     const wxValidator& validator,
     const wxString& name)

-{
-    m_macIsUserPane = false;
-
+{    
+    DontCreatePeer();
+    

     m_macMinimumStatic = NULL;
     m_macMaximumStatic = NULL;
     m_macValueStatic = NULL;
     m_macMinimumStatic = NULL;
     m_macMaximumStatic = NULL;
     m_macValueStatic = NULL;


@@ -105,6 +104,7 @@ bool wxSlider::Create(wxWindow *parent,
 
     SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() ));
 
 
     SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() ));
 

+#if 0

     if (style & wxSL_VERTICAL)
         // Forces SetSize to use the proper width
         SetSizeHints(10, -1, 10, -1);
     if (style & wxSL_VERTICAL)
         // Forces SetSize to use the proper width
         SetSizeHints(10, -1, 10, -1);


@@ -115,7 +115,8 @@ bool wxSlider::Create(wxWindow *parent,
     // NB: SetSizeHints is overloaded by wxSlider and will substitute 10 with the
     // proper dimensions, it also means other people cannot bugger the slider with
     // other values
     // NB: SetSizeHints is overloaded by wxSlider and will substitute 10 with the
     // proper dimensions, it also means other people cannot bugger the slider with
     // other values

-
+#endif
+    

     if (style & wxSL_LABELS)
     {
         m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
     if (style & wxSL_LABELS)
     {
         m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );


@@ -297,7 +298,7 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent)
     event.SetEventObject( this );
     HandleWindowEvent( event );
 
     event.SetEventObject( this );
     HandleWindowEvent( event );
 

-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
+    wxCommandEvent cevent( wxEVT_SLIDER, m_windowId );

     cevent.SetInt( value );
     cevent.SetEventObject( this );
     HandleWindowEvent( cevent );
     cevent.SetInt( value );
     cevent.SetEventObject( this );
     HandleWindowEvent( cevent );


@@ -476,6 +477,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
     // yet another hack since this is a composite control
     // when wxSlider has it's size hardcoded, we're not allowed to
     // change the size. But when the control has labels, we DO need
     // yet another hack since this is a composite control
     // when wxSlider has it's size hardcoded, we're not allowed to
     // change the size. But when the control has labels, we DO need

+    

     // to resize the internal Mac control to accommodate the text labels.
     // We need to trick the wxWidgets resize mechanism so that we can
     // resize the slider part of the control ONLY.
     // to resize the internal Mac control to accommodate the text labels.
     // We need to trick the wxWidgets resize mechanism so that we can
     // resize the slider part of the control ONLY.


@@ -486,7 +488,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 
     if (GetWindowStyle() & wxSL_LABELS)
     {
 
     if (GetWindowStyle() & wxSL_LABELS)
     {

-        // make sure we don't allow the entire control to be resized accidently
+        // make sure we don't allow the entire control to be resized accidentally

         if (width == GetSize().x)
             m_minWidth = -1;
     }
         if (width == GetSize().x)
             m_minWidth = -1;
     }