Added test for sprintf and vsnprintf to fix string.cpp for non-GNU systems.

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

diff --git a/utils/ogl/src/divided.h b/utils/ogl/src/divided.h
index aaf23de3308fb39941e8c9a68206eb716ca32ae4..f8404637dfabfc191a5915763ed5cf3466f7cf29 100644 (file)
--- a/utils/ogl/src/divided.h
+++ b/utils/ogl/src/divided.h
@@ -32,13 +32,13 @@ class wxDividedShape: public wxRectangleShape
  DECLARE_DYNAMIC_CLASS(wxDividedShape)
 
  public:
  DECLARE_DYNAMIC_CLASS(wxDividedShape)
 
  public:

-  wxDividedShape(float w = 0.0, float h = 0.0);
+  wxDividedShape(double w = 0.0, double h = 0.0);

   ~wxDividedShape();
 
   void OnDraw(wxDC& dc);
   void OnDrawContents(wxDC& dc);
 
   ~wxDividedShape();
 
   void OnDraw(wxDC& dc);
   void OnDrawContents(wxDC& dc);
 

-  void SetSize(float w, float h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = TRUE);

 
   void MakeControlPoints();
   void ResetControlPoints();
 
   void MakeControlPoints();
   void ResetControlPoints();


@@ -47,13 +47,11 @@ class wxDividedShape: public wxRectangleShape
   void ResetMandatoryControlPoints();
 
 #ifdef PROLOGIO
   void ResetMandatoryControlPoints();
 
 #ifdef PROLOGIO

-  // Prolog database stuff
-  void WritePrologAttributes(wxExpr *clause);
-  void ReadPrologAttributes(wxExpr *clause);
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);

 #endif
 
 #endif
 

-  void Copy(wxDividedShape &copy);
-  wxShape *PrivateCopy();
+  void Copy(wxShape &copy);

 
   // Set all region sizes according to proportions and
   // this object total size
 
   // Set all region sizes according to proportions and
   // this object total size


@@ -63,13 +61,13 @@ class wxDividedShape: public wxRectangleShape
   void EditRegions();
 
   // Attachment points correspond to regions in the divided box
   void EditRegions();
 
   // Attachment points correspond to regions in the divided box

-  bool GetAttachmentPosition(int attachment, float *x, float *y,
+  bool GetAttachmentPosition(int attachment, double *x, double *y,

                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   bool AttachmentIsValid(int attachment);
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   bool AttachmentIsValid(int attachment);

-  int GetNumberOfAttachments();
+  int GetNumberOfAttachments() const;

 
   // Invoke editor on CTRL-right click
 
   // Invoke editor on CTRL-right click

-  void OnRightClick(float x, float y, int keys = 0, int attachment = 0);
+  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);

 };
 
 #endif
 };
 
 #endif