From 41bf0eb335ef9941b0aa87f8d5d040cd86620755 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sun, 25 Jul 1999 14:38:28 +0000
Subject: [PATCH]   Added wxStaticBitmap::SetIcon()   wxDC now inits with a
 WHITE_BRUSH as wxMSW seems to    do the same   small doc updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/strmbase.tex | 6 +++---
 docs/latex/wx/toolbar.tex  | 2 +-
 include/wx/gtk/statbmp.h   | 6 ++++++
 include/wx/gtk1/statbmp.h  | 6 ++++++
 src/gtk/dc.cpp             | 2 +-
 src/gtk1/dc.cpp            | 2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/latex/wx/strmbase.tex b/docs/latex/wx/strmbase.tex
index 7876d607b5..ff108b3b93 100644
--- a/docs/latex/wx/strmbase.tex
+++ b/docs/latex/wx/strmbase.tex
@@ -76,9 +76,9 @@ real position in the stream.
 
 See \helpref{OnSysRead}{wxstreambaseonsysread}.
 
-\membersection{wxStreamBase::StreamSize}
+\membersection{wxStreamBase::GetSize}
 
-\constfunc{size\_t}{StreamSize}{\void}
+\constfunc{size\_t}{GetSize}{\void}
 
 This function returns the size of the stream. For example, for a file it is the size of
 the file).
@@ -86,7 +86,7 @@ the file).
 \wxheading{Warning}
 
 There are streams which do not have size by definition, such as socket streams.
-In that cases, StreamSize returns an invalid size represented by
+In that cases, GetSize returns an invalid size represented by
 
 \begin{verbatim}
 ~(size_t)0
diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index dee3ddd93c..c348cf28c8 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -648,7 +648,7 @@ Sets the default separator size. The default value is 5.
 
 \func{void}{ToggleTool}{\param{int }{toolIndex}, \param{const bool}{ toggle}}
 
-Toggles a tool on or off.
+Toggles a tool on or off. This does not cause any event to get emitted.
 
 \wxheading{Parameters}
 
diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index 4716ffd797..0d9bcddfb3 100644
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -74,6 +74,12 @@ public:
         return (const wxIcon &)m_bitmap;
     }
 
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+
 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();
diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index 4716ffd797..0d9bcddfb3 100644
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -74,6 +74,12 @@ public:
         return (const wxIcon &)m_bitmap;
     }
 
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+
 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 57c1f336a7..d98edaf9ec 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -48,7 +48,7 @@ wxDC::wxDC()
 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
-    m_brush = *wxTRANSPARENT_BRUSH;
+    m_brush = *wxWHITE_BRUSH;
 }
 
 void wxDC::DoSetClippingRegion( long x, long y, long width, long height )
diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 57c1f336a7..d98edaf9ec 100644
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -48,7 +48,7 @@ wxDC::wxDC()
 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
-    m_brush = *wxTRANSPARENT_BRUSH;
+    m_brush = *wxWHITE_BRUSH;
 }
 
 void wxDC::DoSetClippingRegion( long x, long y, long width, long height )
-- 
2.45.2