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

Removed some debug code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-02-22 00:01:03 +00:00
parent 0ba143c9a0
commit 40c7018756
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/listctrl.cpp
View File

@@ -342,6 +342,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
if (s.IsNull()) s = "H"; if (s.IsNull()) s = "H";
wxCoord lw,lh; wxCoord lw,lh;
dc->GetTextExtent( s, &lw, &lh ); dc->GetTextExtent( s, &lw, &lh );
if (lh < 15) lh = 15;
item->SetSize( item->GetWidth(), lh ); item->SetSize( item->GetWidth(), lh );
m_bound_all.width += lw; m_bound_all.width += lw;
m_bound_all.height = lh; m_bound_all.height = lh;
@@ -440,6 +441,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
{ {
wxCoord lw,lh; wxCoord lw,lh;
dc->GetTextExtent( "H", &lw, &lh ); dc->GetTextExtent( "H", &lw, &lh );
if (lh < 15) lh = 15;
m_bound_all.x = 0; m_bound_all.x = 0;
m_bound_all.y -= 0; m_bound_all.y -= 0;
m_bound_all.height = lh+3; m_bound_all.height = lh+3;
@@ -456,6 +458,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
if (s.IsEmpty()) s = wxT("H"); if (s.IsEmpty()) s = wxT("H");
wxCoord lw,lh; wxCoord lw,lh;
dc->GetTextExtent( s, &lw, &lh ); dc->GetTextExtent( s, &lw, &lh );
if (lh < 15) lh = 15;
m_bound_label.width = lw; m_bound_label.width = lw;
m_bound_label.height = lh; m_bound_label.height = lh;
if (item->HasImage()) if (item->HasImage())
@@ -676,7 +679,6 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
while (node) while (node)
{ {
wxListItemData *item = (wxListItemData*)node->Data(); wxListItemData *item = (wxListItemData*)node->Data();
dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() );
int x = item->GetX(); int x = item->GetX();
if (item->HasImage()) if (item->HasImage())
{ {
@@ -685,9 +687,10 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
m_owner->GetImageSize( item->GetImage(), x, y ); m_owner->GetImageSize( item->GetImage(), x, y );
x += item->GetX() + 5; x += item->GetX() + 5;
} }
dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() );
if (item->HasText()) if (item->HasText())
{ {
dc->DrawText( item->GetText(), x, item->GetY() ); dc->DrawText( item->GetText(), x, item->GetY()+1 );
} }
dc->DestroyClippingRegion(); dc->DestroyClippingRegion();
node = node->Next(); node = node->Next();
@@ -883,9 +886,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetPen( *wxWHITE_PEN ); dc.SetPen( *wxWHITE_PEN );
DoDrawRect( &dc, x, y, cw, h-2 ); DoDrawRect( &dc, x, y, cw, h-2 );
// dc.SetClippingRegion( x, y, cw-5, h-4 ); dc.SetClippingRegion( x, y, cw-5, h-4 );
dc.DrawText( item.m_text, x+4, y+3 ); dc.DrawText( item.m_text, x+4, y+3 );
// dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
x += item.m_width; x += item.m_width;
#if wxUSE_GENERIC_LIST_EXTENSIONS #if wxUSE_GENERIC_LIST_EXTENSIONS
if (dc.LogicalToDeviceX(x) > w+5) break; if (dc.LogicalToDeviceX(x) > w+5) break;

8
src/gtk/dcclient.cpp
View File

@@ -667,6 +667,14 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED ); gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
gdk_gc_set_stipple( gc, mask ); gdk_gc_set_stipple( gc, mask );
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
/*
gdk_gc_set_clip_mask( m_brushGC, NULL );
gdk_gc_set_clip_mask( m_textGC, NULL );
SetBrush( *wxRED_BRUSH );
DrawRectangle( 70, 0, 70, 1000 );
gdk_draw_bitmap( m_window, m_textGC, new_mask, 0, 0, 100, 5, ww, hh );
gdk_draw_bitmap( m_window, m_textGC, mask, 0, 0, 80, 5, ww, hh );
*/
gdk_gc_unref( gc ); gdk_gc_unref( gc );
} }

4
src/gtk/window.cpp
View File

@@ -612,6 +612,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
/*
if (win->GetName() == wxT("columntitles")) if (win->GetName() == wxT("columntitles"))
{ {
wxPrintf( wxT("OnExpose from ") ); wxPrintf( wxT("OnExpose from ") );
@@ -622,6 +623,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
(int)gdk_event->area.width, (int)gdk_event->area.width,
(int)gdk_event->area.height ); (int)gdk_event->area.height );
} }
*/
win->GetUpdateRegion().Union( gdk_event->area.x, win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y, gdk_event->area.y,
@@ -661,6 +663,7 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
if ((rect->x == 0) && (rect->y == 0) && (rect->width <= 1) && (rect->height <= 1)) if ((rect->x == 0) && (rect->y == 0) && (rect->width <= 1) && (rect->height <= 1))
return; return;
/*
if (win->GetName() == wxT("columntitles")) if (win->GetName() == wxT("columntitles"))
{ {
wxPrintf( wxT("OnDraw from ") ); wxPrintf( wxT("OnDraw from ") );
@@ -671,6 +674,7 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
(int)rect->width, (int)rect->width,
(int)rect->height ); (int)rect->height );
} }
*/
win->GetUpdateRegion().Union( rect->x, rect->y, win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height ); rect->width, rect->height );

8
src/gtk1/dcclient.cpp
View File

@@ -667,6 +667,14 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED ); gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
gdk_gc_set_stipple( gc, mask ); gdk_gc_set_stipple( gc, mask );
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
/*
gdk_gc_set_clip_mask( m_brushGC, NULL );
gdk_gc_set_clip_mask( m_textGC, NULL );
SetBrush( *wxRED_BRUSH );
DrawRectangle( 70, 0, 70, 1000 );
gdk_draw_bitmap( m_window, m_textGC, new_mask, 0, 0, 100, 5, ww, hh );
gdk_draw_bitmap( m_window, m_textGC, mask, 0, 0, 80, 5, ww, hh );
*/
gdk_gc_unref( gc ); gdk_gc_unref( gc );
} }

4
src/gtk1/window.cpp
View File

@@ -612,6 +612,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
/*
if (win->GetName() == wxT("columntitles")) if (win->GetName() == wxT("columntitles"))
{ {
wxPrintf( wxT("OnExpose from ") ); wxPrintf( wxT("OnExpose from ") );
@@ -622,6 +623,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
(int)gdk_event->area.width, (int)gdk_event->area.width,
(int)gdk_event->area.height ); (int)gdk_event->area.height );
} }
*/
win->GetUpdateRegion().Union( gdk_event->area.x, win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y, gdk_event->area.y,
@@ -661,6 +663,7 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
if ((rect->x == 0) && (rect->y == 0) && (rect->width <= 1) && (rect->height <= 1)) if ((rect->x == 0) && (rect->y == 0) && (rect->width <= 1) && (rect->height <= 1))
return; return;
/*
if (win->GetName() == wxT("columntitles")) if (win->GetName() == wxT("columntitles"))
{ {
wxPrintf( wxT("OnDraw from ") ); wxPrintf( wxT("OnDraw from ") );
@@ -671,6 +674,7 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
(int)rect->width, (int)rect->width,
(int)rect->height ); (int)rect->height );
} }
*/
win->GetUpdateRegion().Union( rect->x, rect->y, win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height ); rect->width, rect->height );