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

Fixed module code

Browse Source 
Fixed printing and preview
  Grid: event handlers MUST NOT BE VIRTUAL
  Corrected init code for all DCs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-11-25 17:55:08 +00:00
parent 6e7a2c38f2
commit 031b2a7b8d
12 changed files with 127 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/dcclient.cpp
View File

@@ -555,7 +555,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_origin( m_textGC, xx, yy );
}
gdk_draw_pixmap( m_window, m_textGC, pmap,
source->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc),
@@ -829,6 +829,7 @@ void wxPaintDC::SetBackground( const wxBrush &brush )
m_backgroundBrush.GetColour().CalcPixel( m_cmap );
gdk_gc_set_background( m_brushGC, m_backgroundBrush.GetColour().GetColor() );
gdk_gc_set_background( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
gdk_gc_set_foreground( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
GdkFill fillStyle = GDK_SOLID;
@@ -950,9 +951,22 @@ void wxPaintDC::SetUpDC(void)
m_bgGC = gdk_gc_new( m_window );
SetTextForeground( m_textForegroundColour );
SetTextBackground( m_textBackgroundColour );
SetPen( m_pen );
SetFont( m_font );
SetBrush( m_brush );
wxPen tmp_pen( m_pen );
m_pen = wxNullPen;
SetPen( tmp_pen );
wxFont tmp_font( m_font );
m_font = wxNullFont;
SetFont( tmp_font );
wxBrush tmp_brush( m_brush );
m_brush = wxNullBrush;
SetBrush( tmp_brush );
tmp_brush = m_backgroundBrush;
m_backgroundBrush = wxNullBrush;
SetBackground( tmp_brush );
gdk_gc_set_background( m_penGC, wxWHITE->GetColor() );