1. wxStaticText, wxStaticBox, wxButton drawing implemented
2. "pseudo dynamic" wxTheme creation 3. hack to solve GetBestSize() problem 4. more methods in wxDC:: GetMultiLineTextExtent(), DrawLabel() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,11 +33,11 @@
|
||||
#include "wx/dc.h"
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/event.h"
|
||||
|
||||
#include "wx/univ/renderer.h"
|
||||
#include "wx/univ/theme.h"
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
#include "wx/univ/renderer.h"
|
||||
#include "wx/univ/theme.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -57,7 +57,7 @@
|
||||
void wxWindowBase::OnPaint(wxPaintEvent& event)
|
||||
{
|
||||
// get the renderer and the DC to use
|
||||
wxRenderer *renderer = wxTheme::Get()->GetRenderer();
|
||||
wxWindowRenderer renderer = wxTheme::Get()->GetRenderer();
|
||||
wxPaintDC dc(self);
|
||||
|
||||
// draw the border
|
||||
@@ -70,7 +70,7 @@ void wxWindowBase::OnPaint(wxPaintEvent& event)
|
||||
// draw the border
|
||||
void wxWindowBase::DoDrawBorder(wxDC& dc, wxRenderer *renderer)
|
||||
{
|
||||
if ( !(m_windowStyle & wxNO_BORDER) )
|
||||
if ( !IsTopLevel() && !(m_windowStyle & wxNO_BORDER) )
|
||||
{
|
||||
renderer->DrawBorder(dc, self);
|
||||
}
|
||||
|
Reference in New Issue
Block a user