Force wide char environment version initialization in wxGetEnvMap().

[wxWidgets.git] / include / wx / ribbon / control.h

diff --git a/include/wx/ribbon/control.h b/include/wx/ribbon/control.h
index 7edb02d2f2729ad348999e81a36cebcab05c0ba2..9fd1b92a1d6f353e5a3bd5eb9bf1e211f9233e47 100644 (file)
--- a/include/wx/ribbon/control.h
+++ b/include/wx/ribbon/control.h
@@ -19,6 +19,7 @@
 #include "wx/control.h"
 #include "wx/dynarray.h"
 
+class wxRibbonBar;
 class wxRibbonArtProvider;
 
 class WXDLLIMPEXP_RIBBON wxRibbonControl : public wxControl
@@ -55,6 +56,11 @@ public:
     virtual bool Realize();
     bool Realise() {return Realize();}
 
+    virtual wxRibbonBar* GetAncestorRibbonBar()const;
+
+    // Finds the best width and height given the parent's width and height
+    virtual wxSize GetBestSizeForParentSize(const wxSize& WXUNUSED(parentSize)) const { return GetBestSize(); }
+
 protected:
     wxRibbonArtProvider* m_art;
 
@@ -71,7 +77,7 @@ private:
 #endif
 };
 
-WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonControl*, wxArrayRibbonControl, class WXDLLIMPEXP_RIBBON);
+WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonControl*, wxArrayRibbonControl, class WXDLLIMPEXP_RIBBON);
 
 #endif // wxUSE_RIBBON