changed the button container from wxPanel to wxWindow

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 12100b81cdef2320b31f5b789f8db2b4825eac2a..74533a7442e23485cf71be7ef8b104fd8eaf0529 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -16,6 +16,7 @@
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"

+#include "wx/window.h"

 #include <math.h>
 
 //-----------------------------------------------------------------------------
 #include <math.h>
 
 //-----------------------------------------------------------------------------


@@ -28,34 +29,41 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)

+#endif

 
 /*
  * wxWindowDC
  */
 
 
 /*
  * wxWindowDC
  */
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 

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

 {
 }
 
 {
 }
 

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

 {
        WindowRef windowref ;
 {
        WindowRef windowref ;

-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;

        
        // this time it is really the full window
        
        the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;
        
        // this time it is really the full window
        
        the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;

-       MacSetupPort() ;
+       m_minY = m_minX =  0;
+       wxSize size = the_canvas->GetSize() ;
+       m_maxX = size.x  ;
+       m_maxY = size.y ; 
+

        m_ok = TRUE ;
        m_ok = TRUE ;

+  SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID));

 }
 
 }
 

-wxWindowDC::~wxWindowDC(void)
+wxWindowDC::~wxWindowDC()

 {
 }
 
 {
 }
 


@@ -63,24 +71,27 @@ wxWindowDC::~wxWindowDC(void)
  * wxClientDC
  */
 
  * wxClientDC
  */
 

-wxClientDC::wxClientDC(void)
+wxClientDC::wxClientDC()

 {
 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
        WindowRef windowref ;
 {
 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
        WindowRef windowref ;

-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;

        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;
        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;

-       MacSetupPort() ;
+       m_minY = m_minX =  0;
+       wxSize size = window->GetSize() ;
+       m_maxX = size.x  ;
+       m_maxY = size.y ; 

        m_ok = TRUE ;
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont( window->GetFont() ) ;
 }
 
        m_ok = TRUE ;
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont( window->GetFont() ) ;
 }
 

-wxClientDC::~wxClientDC(void)
+wxClientDC::~wxClientDC()

 {
 }
 
 {
 }
 


@@ -88,23 +99,28 @@ wxClientDC::~wxClientDC(void)
  * wxPaintDC
  */
 
  * wxPaintDC
  */
 

-wxPaintDC::wxPaintDC(void)
+wxPaintDC::wxPaintDC()

 {
 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        WindowRef windowref ;
 {
 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        WindowRef windowref ;

-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;

        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 
        m_macPort = UMAGetWindowPort( windowref ) ;

-       MacSetupPort() ;

        m_ok = TRUE ;
        m_ok = TRUE ;

-       long x , y ,w , h ;
+       /*
+       wxCoord x , y ,w , h ;

        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;

+       m_minY = m_minX =  0;
+       wxSize size = window->GetSize() ;
+       m_maxX = size.x  ;
+       m_maxY = size.y ; 

        SetClippingRegion( x , y , w , h ) ;
        SetClippingRegion( x , y , w , h ) ;

+       */

        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }