Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/artprov.h b/interface/wx/artprov.h
index ca549aed6009884c87f917d29dbe78a98ed8fb75..0ef4101dbb2fdbf8497de69241e80c7ac91b803c 100644 (file)
--- a/interface/wx/artprov.h
+++ b/interface/wx/artprov.h
@@ -378,6 +378,21 @@ public:
     */
     static bool Remove(wxArtProvider* provider);
 
+    /**
+     * Helper used by GetMessageBoxIcon(): return the art id corresponding to
+     * the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
+     * can be set)
+     */
+    static wxArtID GetMessageBoxIconId(int flags);
+
+    /**
+     * Helper used by several generic classes: return the icon corresponding to
+     * the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
+     * can be set)
+     */
+    static wxIcon GetMessageBoxIcon(int flags);
+
+
 protected:
 
     /**

diff --git a/interface/wx/config.h b/interface/wx/config.h
index 67657ed11ebe46e8b10eed247a41db31cc00904c..a5c930c7d3691af0806a040461d0ef8d536a687f 100644 (file)
--- a/interface/wx/config.h
+++ b/interface/wx/config.h
@@ -6,6 +6,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+
+// Flags for constructor style parameter
+enum
+{
+    wxCONFIG_USE_LOCAL_FILE = 1,
+    wxCONFIG_USE_GLOBAL_FILE = 2,
+    wxCONFIG_USE_RELATIVE_PATH = 4,
+    wxCONFIG_USE_NO_ESCAPE_CHARACTERS = 8,
+    wxCONFIG_USE_SUBDIR = 16
+};
+
+
 /**
     @class wxConfigBase
 
@@ -905,7 +917,7 @@ public:
     @library{wxbase}
     @category{cfg}
 */
-class WXDLLIMPEXP_BASE wxConfigPathChanger
+class wxConfigPathChanger
 {
 public:
 

diff --git a/interface/wx/dcbuffer.h b/interface/wx/dcbuffer.h
index 93492e4b5a9457b05f2826e1c2f22e7733e8746b..bad9f71789230ef3d7a2a63fb75e7f631ba59bcd 100644 (file)
--- a/interface/wx/dcbuffer.h
+++ b/interface/wx/dcbuffer.h
@@ -154,6 +154,13 @@ public:
 };
 
 
+/**
+ * Check if the window is natively double buffered and will return a wxPaintDC
+ * if it is, a wxBufferedPaintDC otherwise.  It is the caller's responsibility
+ * to delete the wxDC pointer when finished with it.
+ */
+wxDC* wxAutoBufferedPaintDCFactory(wxWindow* window);
+
 
 /**
     @class wxBufferedPaintDC