added DoPrepareDC()

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index bedce4cc7673ac328ba4816945251b12fda4f6bc..bcfb3940df520ed1d178b857182be7c8cca38989 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -127,7 +127,7 @@ public:
 
     // Override this function if you don't want to have wxScrolledWindow
     // automatically change the origin according to the scroll position.
 
     // Override this function if you don't want to have wxScrolledWindow
     // automatically change the origin according to the scroll position.

-    virtual void PrepareDC(wxDC& dc);
+    void PrepareDC(wxDC& dc) { DoPrepareDC(); }

 
     // lay out the window and its children
     virtual bool Layout();
 
     // lay out the window and its children
     virtual bool Layout();


@@ -164,6 +164,8 @@ public:
     void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
 #endif // WXWIN_COMPATIBILITY_2_2
 
     void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
 #endif // WXWIN_COMPATIBILITY_2_2
 

+    virtual void DoPrepareDC(wxDC& dc);
+

 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;
 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;

diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index bedce4cc7673ac328ba4816945251b12fda4f6bc..bcfb3940df520ed1d178b857182be7c8cca38989 100644 (file)
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -127,7 +127,7 @@ public:
 
     // Override this function if you don't want to have wxScrolledWindow
     // automatically change the origin according to the scroll position.
 
     // Override this function if you don't want to have wxScrolledWindow
     // automatically change the origin according to the scroll position.

-    virtual void PrepareDC(wxDC& dc);
+    void PrepareDC(wxDC& dc) { DoPrepareDC(); }

 
     // lay out the window and its children
     virtual bool Layout();
 
     // lay out the window and its children
     virtual bool Layout();


@@ -164,6 +164,8 @@ public:
     void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
 #endif // WXWIN_COMPATIBILITY_2_2
 
     void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
 #endif // WXWIN_COMPATIBILITY_2_2
 

+    virtual void DoPrepareDC(wxDC& dc);
+

 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;
 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 638e29194acb190804f429a71824402ab9215683..4d82bb3209d4ed1b486b1732e71eca2713f252a4 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -453,7 +453,7 @@ wxWindow *wxScrolledWindow::GetTargetWindow() const
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.

-void wxScrolledWindow::PrepareDC(wxDC& dc)
+void wxScrolledWindow::DoPrepareDC(wxDC& dc)

 {
     dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
                         -m_yScrollPosition * m_yScrollPixelsPerLine );
 {
     dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
                         -m_yScrollPosition * m_yScrollPixelsPerLine );

diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 638e29194acb190804f429a71824402ab9215683..4d82bb3209d4ed1b486b1732e71eca2713f252a4 100644 (file)
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -453,7 +453,7 @@ wxWindow *wxScrolledWindow::GetTargetWindow() const
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.
 
 // Override this function if you don't want to have wxScrolledWindow
 // automatically change the origin according to the scroll position.

-void wxScrolledWindow::PrepareDC(wxDC& dc)
+void wxScrolledWindow::DoPrepareDC(wxDC& dc)

 {
     dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
                         -m_yScrollPosition * m_yScrollPixelsPerLine );
 {
     dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
                         -m_yScrollPosition * m_yScrollPixelsPerLine );