From 4a065572bf8288c5964f0319ef958b3423b49a4a Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 8 Mar 2005 00:43:06 +0000
Subject: [PATCH] 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       | 15 +++++++++------
 wxPython/src/_defs.i     |  6 ------
 wxPython/src/_settings.i |  2 +-
 wxPython/src/_toplvl.i   |  3 +++
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index 821e8db034..64aa56c535 100644
--- a/wxPython/src/_dc.i
+++ b/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,17 +1276,19 @@ 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(),
         "Copies everything drawn on the DC so far to the underlying DC
 associated with this object, if any.", "");
     
-    
+   
     DocDeclStr(
         void , UnMask(),
         "Blits the buffer to the dc, and detaches the dc from the buffer (so it
diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index d196575a2e..10e791c591 100644
--- a/wxPython/src/_defs.i
+++ b/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,
 
diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index b4bc618260..952189fb32 100644
--- a/wxPython/src/_settings.i
+++ b/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);
diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 4032625afe..6661972137 100644
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -50,6 +50,9 @@ enum
     wxFRAME_NO_TASKBAR,
     wxFRAME_SHAPED,
     wxFRAME_DRAWER,
+
+    wxFRAME_EX_METAL,
+    wxDIALOG_EX_METAL,
     
     // Obsolete
     wxDIALOG_MODAL,
-- 
2.47.2