Applied [ 565397 ] FL wxNewBitmapButton patch

[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 e9e448807c2e463a5985fe302811d24d0495f044..c06b912a3565e9596e48ae5ca6dfb6b3e0daf6a9 100644 (file)
--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -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.
@@ -1025,6 +1026,14 @@ class cbCommonPaneProperties : public wxObject
         // Default constructor.
 
     cbCommonPaneProperties(void);
+
+        // Copy constructor
+    
+    cbCommonPaneProperties(const cbCommonPaneProperties&);
+
+        // Assignment operator
+    
+    cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
 };
 
 /*