X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2646f485163f410baaad5bcf49028c604a352d19..637b7e4f3a0fd1c6bdfc21d28e37bcf760e3b364:/src/mac/classic/control.cpp

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 473bdec9fd..b186171c35 100644
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
-
 #include "wx/defs.h"
 
 #include "wx/control.h"
@@ -31,14 +27,12 @@
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"
@@ -78,7 +72,7 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
         wxControl*  wx = (wxControl*) GetControlReference( control ) ;
         if ( wx )
         {
-            wx->MacHandleControlClick( control , partCode , true /* stillDown */ ) ;
+            wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
         }
     }
 }
@@ -727,7 +721,7 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
                     wxTheApp->s_lastMouseDown = 0 ;
                     if ( control && controlpart != kControlNoPart ) 
                     {
-                        MacHandleControlClick( control , controlpart , false /* mouse not down anymore */ ) ;
+                        MacHandleControlClick( (WXWidget) control , controlpart , false /* mouse not down anymore */ ) ;
                     }
                 }
             }
@@ -770,7 +764,7 @@ void wxControl::DoSetWindowVariant( wxWindowVariant variant )
     // and make this NORMAL later, but first 
     // we have a few calculations that we must fix
 
-    if ( variant == wxWINDOW_VARIANT_DEFAULT )
+    if ( variant == wxWINDOW_VARIANT_NORMAL )
     {
         if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
             variant  = wxWINDOW_VARIANT_NORMAL ;