Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxStaticBitmap::SetIcon()

Browse Source 
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
This commit is contained in:
Robert Roebling
1999-07-25 14:38:28 +00:00
parent a58d5df4ef
commit 41bf0eb335
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/latex/wx/strmbase.tex
View File

@@ -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 This function returns the size of the stream. For example, for a file it is the size of
the file). the file).
@@ -86,7 +86,7 @@ the file).
\wxheading{Warning} \wxheading{Warning}
There are streams which do not have size by definition, such as socket streams. 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} \begin{verbatim}
~(size_t)0 ~(size_t)0

2
docs/latex/wx/toolbar.tex
View File

@@ -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}

6
include/wx/gtk/statbmp.h
View File

@@ -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: private:
// creates the new pixmap widget // creates the new pixmap widget
void CreatePixmapWidget(); void CreatePixmapWidget();

6
include/wx/gtk1/statbmp.h
View File

@@ -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: private:
// creates the new pixmap widget // creates the new pixmap widget
void CreatePixmapWidget(); void CreatePixmapWidget();

2
src/gtk/dc.cpp
View File

@@ -48,7 +48,7 @@ wxDC::wxDC()
m_pen = *wxBLACK_PEN; m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT; 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 )

2
src/gtk1/dc.cpp
View File

@@ -48,7 +48,7 @@ wxDC::wxDC()
m_pen = *wxBLACK_PEN; m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT; 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 )