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

diff --git a/docs/latex/wx/strmbase.tex b/docs/latex/wx/strmbase.tex
index 7876d607b59a8d373a77314a8d2b725c16e8e06b..ff108b3b9355083191f54ac8ebba468e40e23227 100644 (file)
--- 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}.
 
 
 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).
 
 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.
 \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
 
 \begin{verbatim}
 ~(size_t)0

diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index dee3ddd93c0662a35fef953dae465b25341c8d01..c348cf28c852117e7280f62fedba7f678fab06ac 100644 (file)
--- 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}}
 
 
 \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}
 
 
 \wxheading{Parameters}
 

diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index 4716ffd797fb45c02bbb1c4350b7080166465e3c..0d9bcddfb33f290b0590bc96bd780fc43eb1ecff 100644 (file)
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -74,6 +74,12 @@ public:
         return (const wxIcon &)m_bitmap;
     }
 
         return (const wxIcon &)m_bitmap;
     }
 

+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+

 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();
 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();

diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index 4716ffd797fb45c02bbb1c4350b7080166465e3c..0d9bcddfb33f290b0590bc96bd780fc43eb1ecff 100644 (file)
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -74,6 +74,12 @@ public:
         return (const wxIcon &)m_bitmap;
     }
 
         return (const wxIcon &)m_bitmap;
     }
 

+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+

 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();
 private:
     // creates the new pixmap widget
     void CreatePixmapWidget();

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 57c1f336a796432cc9aa3d51a50e6a48e43377c5..d98edaf9ec094c5c1affe59f1669b3dce8b42c6e 100644 (file)
--- 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_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 )
 }
 
 void wxDC::DoSetClippingRegion( long x, long y, long width, long height )

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 57c1f336a796432cc9aa3d51a50e6a48e43377c5..d98edaf9ec094c5c1affe59f1669b3dce8b42c6e 100644 (file)
--- 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_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 )
 }
 
 void wxDC::DoSetClippingRegion( long x, long y, long width, long height )