Little tweaks to match CVS changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -1267,7 +1267,8 @@ public:
 | 
				
			|||||||
        as the bitmap doesn't have to be recreated each time but it
 | 
					        as the bitmap doesn't have to be recreated each time but it
 | 
				
			||||||
        also requires more memory as the bitmap is never freed. The
 | 
					        also requires more memory as the bitmap is never freed. The
 | 
				
			||||||
        bitmap should have appropriate size, anything drawn outside of
 | 
					        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
 | 
					    :param style: The style parameter indicates whether the supplied buffer is
 | 
				
			||||||
        intended to cover the entire virtual size of a `wx.ScrolledWindow` or
 | 
					        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``.
 | 
					        ``wx.BUFFER_VIRTUAL_AREA`` and ``wx.BUFFER_CLIENT_AREA``.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
");
 | 
					");
 | 
				
			||||||
    wxBufferedDC( wxDC *dc, const wxBitmap &buffer, int style = wxBUFFER_CLIENT_AREA );
 | 
					    wxBufferedDC( wxDC* dc,
 | 
				
			||||||
    wxBufferedDC( wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA );
 | 
					                  const wxBitmap& buffer=wxNullBitmap,
 | 
				
			||||||
    
 | 
					                  int style = wxBUFFER_CLIENT_AREA );
 | 
				
			||||||
 | 
					    wxBufferedDC( wxDC* dc,
 | 
				
			||||||
 | 
					                  const wxSize& area,
 | 
				
			||||||
 | 
					                  int style = wxBUFFER_CLIENT_AREA );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    DocCtorStr(
 | 
					    DocCtorStr(
 | 
				
			||||||
        ~wxBufferedDC(),
 | 
					        ~wxBufferedDC(),
 | 
				
			||||||
        "Copies everything drawn on the DC so far to the underlying DC
 | 
					        "Copies everything drawn on the DC so far to the underlying DC
 | 
				
			||||||
associated with this object, if any.", "");
 | 
					associated with this object, if any.", "");
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    
 | 
					   
 | 
				
			||||||
    DocDeclStr(
 | 
					    DocDeclStr(
 | 
				
			||||||
        void , UnMask(),
 | 
					        void , UnMask(),
 | 
				
			||||||
        "Blits the buffer to the dc, and detaches the dc from the buffer (so it
 | 
					        "Blits the buffer to the dc, and detaches the dc from the buffer (so it
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -406,12 +406,6 @@ enum {
 | 
				
			|||||||
    wxCENTRE_ON_SCREEN,
 | 
					    wxCENTRE_ON_SCREEN,
 | 
				
			||||||
    wxCENTER_ON_SCREEN,
 | 
					    wxCENTER_ON_SCREEN,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxED_CLIENT_MARGIN,
 | 
					 | 
				
			||||||
    wxED_BUTTONS_BOTTOM,
 | 
					 | 
				
			||||||
    wxED_BUTTONS_RIGHT,
 | 
					 | 
				
			||||||
    wxED_STATIC_LINE,
 | 
					 | 
				
			||||||
    wxEXT_DIALOG_STYLE,
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    wxCLIP_CHILDREN,
 | 
					    wxCLIP_CHILDREN,
 | 
				
			||||||
    wxCLIP_SIBLINGS,
 | 
					    wxCLIP_SIBLINGS,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -165,7 +165,7 @@ public:
 | 
				
			|||||||
    static wxFont GetFont(wxSystemFont index);
 | 
					    static wxFont GetFont(wxSystemFont index);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // get a system-dependent metric
 | 
					    // 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
 | 
					    // return True if the port has certain feature
 | 
				
			||||||
    static bool HasFeature(wxSystemFeature index);
 | 
					    static bool HasFeature(wxSystemFeature index);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,6 +50,9 @@ enum
 | 
				
			|||||||
    wxFRAME_NO_TASKBAR,
 | 
					    wxFRAME_NO_TASKBAR,
 | 
				
			||||||
    wxFRAME_SHAPED,
 | 
					    wxFRAME_SHAPED,
 | 
				
			||||||
    wxFRAME_DRAWER,
 | 
					    wxFRAME_DRAWER,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    wxFRAME_EX_METAL,
 | 
				
			||||||
 | 
					    wxDIALOG_EX_METAL,
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    // Obsolete
 | 
					    // Obsolete
 | 
				
			||||||
    wxDIALOG_MODAL,
 | 
					    wxDIALOG_MODAL,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user