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

Upport wxMiniFrame corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-11-07 11:04:27 +00:00
parent f2633e547c
commit 39db4477f1
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/minifram.cpp
View File

@@ -96,19 +96,22 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
(style & wxTINY_CAPTION_VERT)))
{
dc.SetFont( *wxSMALL_FONT );
int height = dc.GetCharHeight();
wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
dc.SetBrush( brush );
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( 3, 3, win->m_width - 7, height );
dc.DrawRectangle( win->m_miniEdge-1,
win->m_miniEdge-1,
win->m_width - (2*(win->m_miniEdge-1)),
15 );
dc.SetTextForeground( *wxWHITE );
dc.DrawText( win->GetTitle(), 6, 3 );
dc.DrawText( win->GetTitle(), 6, 4 );
if (style & wxCLOSE_BOX)
dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );
}
return false;
}
}
@@ -162,12 +165,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
}
}
wxClientDC dc(win);
dc.SetFont( *wxSMALL_FONT );
int height = dc.GetCharHeight() + 1;
if (y > height) return TRUE;
if (y > win->m_miniEdge-1 + 15) return TRUE;
gdk_window_raise( win->m_widget->window );