Anim doesn't depend on GIF, remove wxUSE_GIF.

[wxWidgets.git] / src / mac / carbon / dcclient.cpp

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index f706434036799f99d1193e9da44a50d61957b73d..fc005335a256d9e98211aacf5d253c3dc1bd52a7 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -16,21 +16,19 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"

+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"
+    #include "wx/toplevel.h"
+    #include "wx/math.h"
+    #include "wx/region.h"

 #endif
 
 #endif
 

-#include "wx/dcmemory.h"
-#include "wx/region.h"
-#include "wx/toplevel.h"
-#include "wx/settings.h"
-#include "wx/math.h"

 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-#define RAD2DEG 57.2957795131
-

 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------


@@ -75,7 +73,11 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 break ;
             }
 
                 break ;
             }
 

-            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )
+#if wxUSE_TAB_DIALOG
+                 || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )
+#endif // wxUSE_TAB_DIALOG
+                )

             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;
                 int x , y ;
             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;
                 int x , y ;


@@ -120,7 +122,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     int x , y ;
     x = y = 0 ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     int x , y ;
     x = y = 0 ;

-    wxSize size = window->GetSize() ;

     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     m_ok = true ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     m_ok = true ;