added semicolons after wxCHECK()s (part of patch 1450705)

[wxWidgets.git] / src / mac / classic / control.cpp

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 895237481fb77ec2f56aaa1cc5ccf53275d92867..b186171c3577072d131c9eb7245d38cff542a846 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -6,13 +6,9 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/control.h"
 #include "wx/defs.h"
 
 #include "wx/control.h"


@@ -31,14 +27,12 @@
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 
 #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()
 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"
 
 #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 )
         {
         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 ) 
                     {
                     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
 
     // 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 ;
     {
         if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
             variant  = wxWINDOW_VARIANT_NORMAL ;