Rework IE virtual file system support to use new syntax. Remove now unused code for...

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index ce34052eb89b80824814e8c965078bab872eed72..1e6ab4bb99043c0a546bc49e88e34982c51f9912 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        src/univ/window.cpp
+// Name:        src/univ/winuniv.cpp

 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -258,7 +258,7 @@ void wxWindow::SetBackground(const wxBitmap& bitmap,
 const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
                                                wxStretch *stretch) const
 {
 const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
                                                wxStretch *stretch) const
 {

-    if ( m_bitmapBg.Ok() )
+    if ( m_bitmapBg.IsOk() )

     {
         if ( alignment )
             *alignment = m_alignBgBitmap;
     {
         if ( alignment )
             *alignment = m_alignBgBitmap;


@@ -408,7 +408,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
 
 void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
 {
 
 void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
 {

-    if ( GetBackgroundBitmap().Ok() )
+    if ( GetBackgroundBitmap().IsOk() )

     {
         // Get the bitmap and the flags
         int alignment;
     {
         // Get the bitmap and the flags
         int alignment;


@@ -728,6 +728,11 @@ wxSize wxWindow::DoGetBestClientSize() const
     return wxWindowNative::DoGetBestSize();
 }
 
     return wxWindowNative::DoGetBestSize();
 }
 

+wxSize wxWindow::DoGetBorderSize() const
+{
+    return AdjustSize(wxSize(0, 0));
+}
+

 wxSize wxWindow::AdjustSize(const wxSize& size) const
 {
     wxSize sz = size;
 wxSize wxWindow::AdjustSize(const wxSize& size) const
 {
     wxSize sz = size;