Update to Scintilla 1.48

[wxWidgets.git] / contrib / include / wx / fl / controlbar.h

diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h
index 168a718d0bf0248ec0f1fe08cdfea33bfd0e5ea3..dbe944fc9db4379bfddc76e3e890ac61896b41a0 100644 (file)
--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -13,7 +13,7 @@
 #ifndef __CONTROLBAR_G__
 #define __CONTROLBAR_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "controlbar.h"
 #endif
 
@@ -823,7 +823,8 @@ public:
     inline cbBarDimHandlerBase* GetDimHandler() { return mpHandler; }
 };
 
-WX_DEFINE_ARRAY(float, cbArrayFloat);
+// FIXME: this array definition compiles but probably doesn't do what was intended (GD)
+WX_DEFINE_ARRAY_LONG(float, cbArrayFloat);
 
 /*
 Helper class used internally by the wxFrameLayout class.
@@ -1002,7 +1003,7 @@ class cbCommonPaneProperties : public wxObject
     bool mRealTimeUpdatesOn;     // default: ON
     bool mOutOfPaneDragOn;       // default: ON
     bool mExactDockPredictionOn; // default: OFF
-    bool mNonDestructFirctionOn; // default: OFF
+    bool mNonDestructFrictionOn; // default: OFF
 
     bool mShow3DPaneBorderOn;    // default: ON
 
@@ -1025,6 +1026,14 @@ class cbCommonPaneProperties : public wxObject
         // Default constructor.
 
     cbCommonPaneProperties(void);
+
+        // Copy constructor
+    
+    cbCommonPaneProperties(const cbCommonPaneProperties&);
+
+        // Assignment operator
+    
+    cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
 };
 
 /*
@@ -1068,7 +1077,7 @@ public: /* protected really */
     // transient properties
 
     wxList          mRowShapeData;   // shapes of bars of recently modified row,
-                                     // stored when in "non-destructive-firction" mode
+                                     // stored when in "non-destructive-friction" mode
     cbRowInfo*      mpStoredRow;     // row-info for which the shapes are stored
 
     friend class wxFrameLayout;