HKEY -> WXHKEY, wxScrolledWindow::SetScale added

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9b01f5765a7f30fd3d139f1d3f35de802ade3141..b4fb9a7b2964278a0b074b0723c72e8a69f8c361 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -867,6 +867,7 @@ typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
+typedef unsigned long   WXHKEY;
 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 435d3f38fff80fefdfd6e7f8d7280e8b489e9c1a..8a337fa77ded534b1d656783902e333801799260 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -83,22 +83,17 @@ public:
   // Actual size in pixels when scrolling is taken into account
   virtual void GetVirtualSize(int *x, int *y) const;
 
+  // Set the scale factor, used in PrepareDC
+  inline void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
+  inline double GetScaleX() const { return m_scaleX; }
+  inline double GetScaleY() const { return m_scaleY; }
+
   virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const ;
   virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const ;
 
   // Adjust the scrollbars
   virtual void AdjustScrollbars(void);
 
-/*
-#if WXWIN_COMPATIBILITY
-  virtual void OldOnScroll(wxCommandEvent& WXUNUSED(event));
-  virtual void OldOnPaint(void);                 // Called when needs painting
-  virtual void OldOnSize(int width, int height);           // Called on resize
-  virtual void OldOnMouseEvent(wxMouseEvent& event);  // Called on mouse event
-  virtual void OldOnChar(wxKeyEvent& event);     // Called on character event
-#endif
-*/
-
   void OnScroll(wxScrollEvent& event);
   void OnSize(wxSizeEvent& event);
   void OnPaint(wxPaintEvent& event);
@@ -130,6 +125,8 @@ protected:
   int                   m_yScrollLines;
   int                   m_xScrollLinesPerPage;
   int                   m_yScrollLinesPerPage;
+  double                m_scaleX;
+  double                m_scaleY;
 
 DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 4452ba9d944f7767facf5a6d00e54bf13565a23a..c330e7dbf0ca4109923d05b9c3831b8be31135f4 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -28,10 +28,13 @@
 // ----------------------------------------------------------------------------
 // types used in this module
 // ----------------------------------------------------------------------------
+
+/*
 #ifndef   HKEY_DEFINED
   #define HKEY_DEFINED
   #define HKEY unsigned long
 #endif
+*/
 
 typedef unsigned long ulong;
 
@@ -87,7 +90,7 @@ public:
     // get the short name of a standard key
   static const char *GetStdKeyShortName(size_t key);
     // get StdKey from root HKEY
-  static StdKey GetStdKeyFromHkey(HKEY hkey);
+  static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 
   // extacts the std key prefix from the string (return value) and
   // leaves only the part after it (i.e. modifies the string passed!)
@@ -113,7 +116,7 @@ public:
     // the name is relative to the parent key
   void  SetName(const wxRegKey& keyParent, const wxString& strKey);
     // hKey should be opened and will be closed in wxRegKey dtor
-  void  SetHkey(HKEY hKey);
+  void  SetHkey(WXHKEY hKey);
 
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.
@@ -200,7 +203,7 @@ private:
   wxRegKey(const wxRegKey& key);            // not implemented
   wxRegKey& operator=(const wxRegKey& key); // not implemented
 
-  HKEY        m_hKey,           // our handle
+  WXHKEY        m_hKey,           // our handle
               m_hRootKey;       // handle of the top key (i.e. StdKey)
   wxString    m_strKey;         // key name (relative to m_hRootKey)