Generic file dialog presentation. Regenerated makefiles.

[wxWidgets.git] / contrib / include / wx / ogl / divided.h

diff --git a/contrib/include/wx/ogl/divided.h b/contrib/include/wx/ogl/divided.h
index f8404637dfabfc191a5915763ed5cf3466f7cf29..07a5c576146cae9a0134cb4ed58018dd8b5e5da2 100644 (file)
--- a/contrib/include/wx/ogl/divided.h
+++ b/contrib/include/wx/ogl/divided.h
@@ -6,16 +6,17 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_DIVIDED_H_
 #define _OGL_DIVIDED_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_DIVIDED_H_
 #define _OGL_DIVIDED_H_
 

-#ifdef __GNUG__
-#pragma interface "basic.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "divided.h"

 #endif
 
 #endif
 

+

 /*
  * Definition of a region
  *
 /*
  * Definition of a region
  *


@@ -27,7 +28,7 @@
  */
 
 extern wxFont *g_oglNormalFont;
  */
 
 extern wxFont *g_oglNormalFont;

-class wxDividedShape: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxDividedShape: public wxRectangleShape

 {
  DECLARE_DYNAMIC_CLASS(wxDividedShape)
 
 {
  DECLARE_DYNAMIC_CLASS(wxDividedShape)
 


@@ -38,7 +39,7 @@ class wxDividedShape: public wxRectangleShape
   void OnDraw(wxDC& dc);
   void OnDrawContents(wxDC& dc);
 
   void OnDraw(wxDC& dc);
   void OnDrawContents(wxDC& dc);
 

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

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


@@ -46,7 +47,7 @@ class wxDividedShape: public wxRectangleShape
   void MakeMandatoryControlPoints();
   void ResetMandatoryControlPoints();
 
   void MakeMandatoryControlPoints();
   void ResetMandatoryControlPoints();
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif


@@ -63,7 +64,7 @@ class wxDividedShape: public wxRectangleShape
   // Attachment points correspond to regions in the divided box
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   // Attachment points correspond to regions in the divided box
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);

-  bool AttachmentIsValid(int attachment);
+  bool AttachmentIsValid(int attachment) const;

   int GetNumberOfAttachments() const;
 
   // Invoke editor on CTRL-right click
   int GetNumberOfAttachments() const;
 
   // Invoke editor on CTRL-right click