Little tweaks to match CVS changes

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

wxPython/src/_dc.i

@@ -1267,7 +1267,8 @@ public:
         as the bitmap doesn't have to be recreated each time but it
         also requires more memory as the bitmap is never freed. The
         bitmap should have appropriate size, anything drawn outside of
-        its bounds is clipped.
+        its bounds is clipped.  If wx.NullBitmap is used then a new
+        buffer will be allocated that is the same size as the dc.
 
     :param style: The style parameter indicates whether the supplied buffer is
         intended to cover the entire virtual size of a `wx.ScrolledWindow` or
@@ -1275,10 +1276,12 @@ public:
         ``wx.BUFFER_VIRTUAL_AREA`` and ``wx.BUFFER_CLIENT_AREA``.
 
 ");
-    wxBufferedDC( wxDC *dc, const wxBitmap &buffer, int style = wxBUFFER_CLIENT_AREA );
-    wxBufferedDC( wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA );
-    
-
+    wxBufferedDC( wxDC* dc,
+                  const wxBitmap& buffer=wxNullBitmap,
+                  int style = wxBUFFER_CLIENT_AREA );
+    wxBufferedDC( wxDC* dc,
+                  const wxSize& area,
+                  int style = wxBUFFER_CLIENT_AREA );
 
     DocCtorStr(
         ~wxBufferedDC(),

wxPython/src/_defs.i

@@ -406,12 +406,6 @@ enum {
     wxCENTRE_ON_SCREEN,
     wxCENTER_ON_SCREEN,
 
-    wxED_CLIENT_MARGIN,
-    wxED_BUTTONS_BOTTOM,
-    wxED_BUTTONS_RIGHT,
-    wxED_STATIC_LINE,
-    wxEXT_DIALOG_STYLE,
-
     wxCLIP_CHILDREN,
     wxCLIP_SIBLINGS,
 

wxPython/src/_settings.i

@@ -165,7 +165,7 @@ public:
     static wxFont GetFont(wxSystemFont index);
 
     // get a system-dependent metric
-    static int GetMetric(wxSystemMetric index);
+    static int GetMetric(wxSystemMetric index, wxWindow* win=NULL);
 
     // return True if the port has certain feature
     static bool HasFeature(wxSystemFeature index);

wxPython/src/_toplvl.i

@@ -51,6 +51,9 @@ enum
     wxFRAME_SHAPED,
     wxFRAME_DRAWER,
 
+    wxFRAME_EX_METAL,
+    wxDIALOG_EX_METAL,
+    
     // Obsolete
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,