define bookctrl (and -derived) classes flags in their headers instead of defs.h;...

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 7f14f9b53adbd3aa6b6e521a95c4fe026f82c961..fc005335a256d9e98211aacf5d253c3dc1bd52a7 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,32 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/mac/carbon/dcclient.cpp

 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"

-#include "wx/dcmemory.h"
-#include "wx/region.h"
-#include "wx/window.h"
-#include "wx/toplevel.h"
-#include "wx/settings.h"
-#include "wx/math.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
+

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

-#include "wx/log.h"

 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-#define RAD2DEG 57.2957795131
-

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


@@ -42,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-    
+

 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {
 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {


@@ -71,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 ;


@@ -83,11 +89,11 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;

-                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; 
+                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ;

                 break ;
             }
                 break ;
             }

-            
-            parent = parent->GetParent() ;  
+
+            parent = parent->GetParent() ;

         }
     }
 
         }
     }
 


@@ -99,14 +105,14 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
 #endif
 
     return bkdBrush ;
 #endif
 
     return bkdBrush ;

-}    
+}

 
 

-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()

 {
     m_window = NULL ;
 }
 
 {
     m_window = NULL ;
 }
 

-wxWindowDC::wxWindowDC(wxWindow *window) 
+wxWindowDC::wxWindowDC(wxWindow *window)

 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;


@@ -116,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 ;


@@ -137,7 +142,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         // situations
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         // situations
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;

-        
+

         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;