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

compilation fix after latest changes (missing header)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-14 20:27:35 +00:00
parent da5a641fc8
commit 7280c8281d
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/msw/renderer.cpp
View File

@@ -48,9 +48,10 @@
#define min(a,b) (((a) < (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b))
#endif #endif
#include "wx/dcgraph.h"
#include "gdiplus.h" #include "gdiplus.h"
using namespace Gdiplus; using namespace Gdiplus;
#endif #endif // wxUSE_GRAPHICS_CONTEXT
// tmschema.h is in Win32 Platform SDK and might not be available with earlier // tmschema.h is in Win32 Platform SDK and might not be available with earlier
// compilers // compilers
@@ -138,7 +139,7 @@ public:
m_graphics->ReleaseHDC(m_hdc); m_graphics->ReleaseHDC(m_hdc);
#endif #endif
} }
operator HDC() const { return m_hdc; } operator HDC() const { return m_hdc; }
private: private:
@@ -192,24 +193,24 @@ public:
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawChoice(wxWindow* win, virtual void DrawChoice(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags=0); int flags=0);
virtual void DrawComboBox(wxWindow* win, virtual void DrawComboBox(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags=0); int flags=0);
virtual void DrawTextCtrl(wxWindow* win, virtual void DrawTextCtrl(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags=0); int flags=0);
virtual void DrawRadioButton(wxWindow* win, virtual void DrawRadioButton(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags=0); int flags=0);
virtual wxSize GetCheckBoxSize(wxWindow *win); virtual wxSize GetCheckBoxSize(wxWindow *win);
@@ -422,7 +423,7 @@ void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
wxColour fill; wxColour fill;
wxColour bdr; wxColour bdr;
COLORREF cref; COLORREF cref;
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
wxUxThemeHandle hTheme(win, L"EDIT"); wxUxThemeHandle hTheme(win, L"EDIT");
if (hTheme) if (hTheme)
@@ -436,10 +437,10 @@ void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
etsState = ETS_DISABLED; etsState = ETS_DISABLED;
else else
etsState = ETS_NORMAL; etsState = ETS_NORMAL;
wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT, wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
etsState, TMT_BORDERCOLOR, &cref); etsState, TMT_BORDERCOLOR, &cref);
bdr = wxRGBToColour(cref); bdr = wxRGBToColour(cref);
} }
else else
#endif #endif
@@ -447,7 +448,7 @@ void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
bdr = *wxBLACK; bdr = *wxBLACK;
} }
dc.SetPen( bdr ); dc.SetPen( bdr );
dc.SetBrush( fill ); dc.SetBrush( fill );
dc.DrawRectangle(rect); dc.DrawRectangle(rect);
@@ -458,8 +459,8 @@ void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
void wxRendererMSW::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererMSW::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {
// Draw the main part of the control same as TextCtrl // Draw the main part of the control same as TextCtrl
DrawTextCtrl(win, dc, rect, flags); DrawTextCtrl(win, dc, rect, flags);
// Draw the button inside the border, on the right side // Draw the button inside the border, on the right side
wxRect br(rect); wxRect br(rect);
br.height -= 2; br.height -= 2;
@@ -477,7 +478,7 @@ void wxRendererMSW::DrawChoice(wxWindow* win, wxDC& dc,
DrawComboBox(win, dc, rect, flags); DrawComboBox(win, dc, rect, flags);
} }
// Draw a themed radio button // Draw a themed radio button
void wxRendererMSW::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererMSW::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {