fixed bug introduced in prior check-ins; minor reformatting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 776f63b21fcfd32a89ce320f1fe9cc739e79723a..7a42cdb52eaea8c51062d8ad259aa4ca4a847b73 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -281,7 +281,6 @@ wxDC::wxDC()
     m_needComputeScaleY = false;
     m_macPort = NULL ;
     m_macMask = NULL ;
     m_needComputeScaleY = false;
     m_macPort = NULL ;
     m_macMask = NULL ;

-    m_ok = false ;

     m_macFontInstalled = false ;
     m_macBrushInstalled = false ;
     m_macPenInstalled = false ;
     m_macFontInstalled = false ;
     m_macBrushInstalled = false ;
     m_macPenInstalled = false ;

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index ad0b0ea59d3d8e7a45c19d1a8c7b586cee441158..884d11064c82858570178c1bdcb58138060dccad 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -54,7 +54,7 @@ const short kUnsupportedMode = -2 ;
 extern TECObjectRef s_TECNativeCToUnicode ;
 
 
 extern TECObjectRef s_TECNativeCToUnicode ;
 
 

-// TODO Update
+// TODO: update

 // The textctrl implementation still needs that (needs what?) for the non-HIView implementation
 //
 wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
 // The textctrl implementation still needs that (needs what?) for the non-HIView implementation
 //
 wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :


@@ -71,7 +71,7 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
         if ( win->GetPeer() )
         {
             int x = 0 , y = 0;
         if ( win->GetPeer() )
         {
             int x = 0 , y = 0;

-            win->MacWindowToRootWindow( &x,&y ) ;
+            win->MacWindowToRootWindow( &x, &y ) ;

             // get area including focus rect
             CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ;
             if ( !EmptyRgn( m_newClip ) )
             // get area including focus rect
             CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ;
             if ( !EmptyRgn( m_newClip ) )


@@ -790,9 +790,11 @@ void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth,
     CGContextRestoreGState(c);
 } 
 
     CGContextRestoreGState(c);
 } 
 

+#pragma mark -
+

 wxDC::wxDC()
 {
 wxDC::wxDC()
 {

-    m_ok = false;
+    m_ok = false ;

     m_colour = true;
     m_mm_to_pix_x = mm2pt;
     m_mm_to_pix_y = mm2pt;
     m_colour = true;
     m_mm_to_pix_x = mm2pt;
     m_mm_to_pix_y = mm2pt;


@@ -805,12 +807,12 @@ wxDC::wxDC()
     m_userScaleY = 1.0;
     m_scaleX = 1.0;
     m_scaleY = 1.0;
     m_userScaleY = 1.0;
     m_scaleX = 1.0;
     m_scaleY = 1.0;

-    m_needComputeScaleX = false;
+    m_needComputeScaleX =

     m_needComputeScaleY = false;
 
     m_needComputeScaleY = false;
 

-    m_ok = false ;

     m_macPort = 0 ;
     m_macPort = 0 ;

-    m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ;
+    m_macLocalOrigin.x =
+    m_macLocalOrigin.y = 0 ;

 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;


@@ -910,7 +912,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
     // we have to update the context as well
 }
 
     // we have to update the context as well
 }
 

-void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
+void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region )

 {
     wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
 
 {
     wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
 


@@ -2124,6 +2126,8 @@ void wxDC::MacInstallFont() const
     }
 }
 
     }
 }
 

+#pragma mark -
+

 // ---------------------------------------------------------------------------
 // coordinates transformations
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // coordinates transformations
 // ---------------------------------------------------------------------------

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 51fe726b1671148be4ab5e72b6601d6555729285..f16d43979d6e71c08b894829ed61bdead9f64344 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -119,7 +119,8 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     wxSize size = window->GetSize() ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     wxSize size = window->GetSize() ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    
+    m_ok = true ;
+

 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;


@@ -153,7 +154,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     SetBackground(MacGetBackgroundBrush(window));
 #endif
 
     SetBackground(MacGetBackgroundBrush(window));
 #endif
 

-    m_ok = true ;

     SetFont( window->GetFont() ) ;
 }
 
     SetFont( window->GetFont() ) ;
 }
 


@@ -192,7 +192,8 @@ wxClientDC::wxClientDC(wxWindow *window)
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    
+    m_ok = true ;
+

 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;


@@ -206,8 +207,8 @@ wxClientDC::wxClientDC(wxWindow *window)
     }
     else
     {
     }
     else
     {

-        // as out of order redraw is not supported under CQ, we have to create a qd port for these
-        // situations
+        // as out of order redraw is not supported under CQ,
+        // we have to create a QD port for these situations

         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;


@@ -224,7 +225,6 @@ wxClientDC::wxClientDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
 #endif
 
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
 #endif
 

-    m_ok = true ;

     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }
     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }


@@ -270,6 +270,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

+    m_ok = true ;

 
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;


@@ -300,7 +301,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     SetBackground(MacGetBackgroundBrush(window));
 #endif
 
     SetBackground(MacGetBackgroundBrush(window));
 #endif
 

-    m_ok = true ;

     SetFont( window->GetFont() ) ;
 }
 
     SetFont( window->GetFont() ) ;
 }