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:
Vadim Zeitlin
2000-08-15 20:42:47 +00:00
parent 9df4cddfa8
commit 4d3c4c2f94
38 changed files with 1752 additions and 399 deletions

View File

@@ -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);
}