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

More progress on wxMotif, incl. wxTreeCtrl/wxListCtrl beginning to work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-04 10:30:39 +00:00
parent b2b3ccc524
commit a367b9b3f8
21 changed files with 182 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/motif/dcclient.cpp
View File

@@ -172,7 +172,7 @@ wxWindowDC::~wxWindowDC(void)
};
void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1),
wxColour* WXUNUSED(col), int WXUNUSED(style) )
const wxColour& WXUNUSED(col), int WXUNUSED(style) )
{
// TODO
};
@@ -1229,7 +1229,8 @@ void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *heigh
if (!theFont->Ok())
{
// TODO: this should be an error log function
cerr << "wxWindows warning - set a valid font before calling GetTextExtent!\n";
wxFAIL_MSG("set a valid font before calling GetTextExtent!");
*width = -1;
*height = -1;
return;
@@ -1298,7 +1299,6 @@ void wxWindowDC::Clear(void)
int w, h;
if (m_window)
{
// TODO: should we get the virtual size?
m_window->GetSize(&w, &h);
if (m_window && m_window->GetBackingPixmap())
@@ -1330,6 +1330,24 @@ void wxWindowDC::Clear(void)
m_brush = saveBrush;
};
void wxWindowDC::Clear(const wxRect& rect)
{
if (!Ok()) return;
int x = rect.x; int y = rect.y;
int w = rect.width; int h = rect.height;
wxBrush saveBrush = m_brush;
SetBrush (m_backgroundBrush);
XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x, y, w, h);
if (m_window && m_window->GetBackingPixmap())
XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, x, y, w, h);
m_brush = saveBrush;
};
void wxWindowDC::SetFont( const wxFont &font )
{
if (!Ok()) return;