part of wxComboBox to wxEntry refactoring (should have been part of rev48952)

[wxWidgets.git] / include / wx / msw / dc.h

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index ee1ab8d4ec895d15a96e7a65b82d6524a2fa31a8..7f2abb4bf673e35a80db3f864cc43cd8bc643cc8 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -78,13 +78,14 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 

+

     virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);
     virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);

-    virtual void SetSystemScale(double x, double y);

     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);

+    

     virtual void SetLogicalFunction(int function);
 
     // implementation from now on
     virtual void SetLogicalFunction(int function);
 
     // implementation from now on


@@ -162,6 +163,8 @@ protected:
     // classes
     wxDC() { Init(); }
 
     // classes
     wxDC() { Init(); }
 

+    void RealizeScaleAndOrigin();
+

     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,