fixed somebody's poorly done StreamSize-->GetSize transition

[wxWidgets.git] / utils / ogl / src / basicp.h

diff --git a/utils/ogl/src/basicp.h b/utils/ogl/src/basicp.h
index 77c6922c142ca8b1ed8ade816c7a51a1156c102e..aa1067764fe1893bf3b298567ecb823f74e6940b 100644 (file)
--- a/utils/ogl/src/basicp.h
+++ b/utils/ogl/src/basicp.h
@@ -62,7 +62,7 @@ class wxControlPoint: public wxRectangleShape
 
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  int GetNumberOfAttachments();
+  int GetNumberOfAttachments() const;
 
   inline void SetEraseObject(bool er) { m_eraseObject = er; }
 
@@ -78,14 +78,14 @@ public:
  * Store original top-left, bottom-right coordinates
  * in case we're doing non-vertical resizing.
  */
-  static double controlPointDragStartX;
-  static double controlPointDragStartY;
-  static double controlPointDragStartWidth;
-  static double controlPointDragStartHeight;
-  static double controlPointDragEndWidth;
-  static double controlPointDragEndHeight;
-  static double controlPointDragPosX;
-  static double controlPointDragPosY;
+  static double sm_controlPointDragStartX;
+  static double sm_controlPointDragStartY;
+  static double sm_controlPointDragStartWidth;
+  static double sm_controlPointDragStartHeight;
+  static double sm_controlPointDragEndWidth;
+  static double sm_controlPointDragEndHeight;
+  static double sm_controlPointDragPosX;
+  static double sm_controlPointDragPosY;
 };
 
 class wxPolygonShape;