From e6460682a21a5f58ff7914676fd80b0730803398 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 30 Nov 1998 12:52:58 +0000 Subject: [PATCH] Hierarchy fixes; bug fix for tabg that was introduced somehow... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/tabg.h | 3 ++ include/wx/msw/dcclient.h | 22 +++++----- include/wx/msw/dcscreen.h | 4 +- include/wx/msw/tbar95.h | 4 +- include/wx/stubs/dcclient.h | 49 +++++++++++++++------ include/wx/stubs/dcscreen.h | 2 +- src/msw/data.cpp | 6 +-- src/msw/dcclient.cpp | 48 +++++++++++++-------- src/msw/listbox.cpp | 4 +- src/msw/tbar95.cpp | 19 ++++++--- src/stubs/dcclient.cpp | 85 +++++++++++++++++++------------------ src/stubs/dcscreen.cpp | 2 +- 12 files changed, 151 insertions(+), 97 deletions(-) diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index 5ae093690b..2fb6dcc27a 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -85,6 +85,9 @@ protected: class WXDLLEXPORT wxTabLayer: public wxList { +// Why did someone remove this, please? +DECLARE_DYNAMIC_CLASS(wxTabLayer) + wxTabLayer():wxList() {} }; /* diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index 3d3ba31886..182b71b686 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -18,33 +18,33 @@ #include "wx/dc.h" -class WXDLLEXPORT wxClientDC: public wxDC +class WXDLLEXPORT wxWindowDC: public wxDC { - DECLARE_DYNAMIC_CLASS(wxClientDC) + DECLARE_DYNAMIC_CLASS(wxWindowDC) public: - wxClientDC(void); + wxWindowDC(void); // Create a DC corresponding to a canvas - wxClientDC(wxWindow *win); + wxWindowDC(wxWindow *win); - ~wxClientDC(void); + ~wxWindowDC(void); }; -class WXDLLEXPORT wxWindowDC: public wxDC +class WXDLLEXPORT wxClientDC: public wxWindowDC { - DECLARE_DYNAMIC_CLASS(wxWindowDC) + DECLARE_DYNAMIC_CLASS(wxClientDC) public: - wxWindowDC(void); + wxClientDC(void); // Create a DC corresponding to a canvas - wxWindowDC(wxWindow *win); + wxClientDC(wxWindow *win); - ~wxWindowDC(void); + ~wxClientDC(void); }; -class WXDLLEXPORT wxPaintDC: public wxDC +class WXDLLEXPORT wxPaintDC: public wxWindowDC { DECLARE_DYNAMIC_CLASS(wxPaintDC) diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h index 6a64c9e934..c3b75bd02b 100644 --- a/include/wx/msw/dcscreen.h +++ b/include/wx/msw/dcscreen.h @@ -16,9 +16,9 @@ #pragma interface "dcscreen.h" #endif -#include "wx/dc.h" +#include "wx/dcclient.h" -class WXDLLEXPORT wxScreenDC: public wxDC +class WXDLLEXPORT wxScreenDC: public wxWindowDC { DECLARE_DYNAMIC_CLASS(wxScreenDC) diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h index 009e629290..756b3f371c 100644 --- a/include/wx/msw/tbar95.h +++ b/include/wx/msw/tbar95.h @@ -44,10 +44,12 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase const wxString& name = wxToolBarNameStr); // Call default behaviour +/* void OnPaint(wxPaintEvent& event) { Default() ; } void OnSize(wxSizeEvent& event) { Default() ; } - void OnMouseEvent(wxMouseEvent& event) { Default() ; } void OnKillFocus(wxFocusEvent& event) { Default() ; } +*/ + void OnMouseEvent(wxMouseEvent& event); // Handle wxToolBar95 events diff --git a/include/wx/stubs/dcclient.h b/include/wx/stubs/dcclient.h index 2e28330adb..99845221b6 100644 --- a/include/wx/stubs/dcclient.h +++ b/include/wx/stubs/dcclient.h @@ -28,23 +28,16 @@ class WXDLLEXPORT wxWindow; // Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented differently. // On many platforms, however, they will be the same. -typedef wxPaintDC wxClientDC; -typedef wxPaintDC wxWindowDC; - -//----------------------------------------------------------------------------- -// wxPaintDC -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxPaintDC: public wxDC +class WXDLLEXPORT wxWindowDC: public wxDC { - DECLARE_DYNAMIC_CLASS(wxPaintDC) + DECLARE_DYNAMIC_CLASS(wxWindowDC) public: - wxPaintDC(void); - wxPaintDC( wxWindow *win ); - - ~wxPaintDC(void); + wxWindowDC(void); + wxWindowDC( wxWindow *win ); + + ~wxWindowDC(void); virtual void FloodFill( long x1, long y1, wxColour* col, int style=wxFLOOD_SURFACE ); virtual bool GetPixel( long x1, long y1, wxColour *col ) const; @@ -97,5 +90,35 @@ class WXDLLEXPORT wxPaintDC: public wxDC virtual void DrawSpline( wxList *points ); }; +//----------------------------------------------------------------------------- +// wxPaintDC +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxPaintDC: public wxWindowDC +{ + DECLARE_DYNAMIC_CLASS(wxPaintDC) + + public: + + wxPaintDC(void):wxWindowDC() {}; + wxPaintDC( wxWindow *win ): wxWindowDC(win) {}; + +}; + +//----------------------------------------------------------------------------- +// wxClientDC +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxClientDC: public wxWindowDC +{ + DECLARE_DYNAMIC_CLASS(wxClientDC) + + public: + + wxClientDC(void):wxWindowDC() {}; + wxClientDC( wxWindow *win ): wxWindowDC(win) {}; + +}; + #endif // _WX_DCCLIENT_H_ diff --git a/include/wx/stubs/dcscreen.h b/include/wx/stubs/dcscreen.h index 12d4996e70..fd92906177 100644 --- a/include/wx/stubs/dcscreen.h +++ b/include/wx/stubs/dcscreen.h @@ -18,7 +18,7 @@ #include "wx/dcclient.h" -class WXDLLEXPORT wxScreenDC: public wxPaintDC +class WXDLLEXPORT wxScreenDC: public wxWindowDC { DECLARE_DYNAMIC_CLASS(wxScreenDC) diff --git a/src/msw/data.cpp b/src/msw/data.cpp index 224686fa5d..53d6991dc3 100644 --- a/src/msw/data.cpp +++ b/src/msw/data.cpp @@ -198,11 +198,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) #include "wx/dcclient.h" #include "wx/dcscreen.h" IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) -IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC) -IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) #if defined(__WXMSW__) #include "wx/dcprint.h" diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index 8af9d2aad7..e1cd97a1ad 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -29,61 +29,73 @@ #include #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) -IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) #endif -wxClientDC::wxClientDC(void) +/* + * wxWindowDC + */ + +wxWindowDC::wxWindowDC(void) { m_canvas = NULL; } -wxClientDC::wxClientDC(wxWindow *the_canvas) +wxWindowDC::wxWindowDC(wxWindow *the_canvas) { m_canvas = the_canvas; -// BeginDrawing(); - m_hDC = (WXHDC) ::GetDC((HWND) the_canvas->GetHWND()); +// m_hDC = (WXHDC) ::GetDCEx((HWND) the_canvas->GetHWND(), NULL, DCX_WINDOW); + m_hDC = (WXHDC) ::GetWindowDC((HWND) the_canvas->GetHWND() ); + m_hDCCount ++; } -wxClientDC::~wxClientDC(void) +wxWindowDC::~wxWindowDC(void) { -// EndDrawing(); - - if (m_canvas && (HDC) m_hDC) + if (m_canvas && m_hDC) { SelectOldObjects(m_hDC); ::ReleaseDC((HWND) m_canvas->GetHWND(), (HDC) m_hDC); m_hDC = 0; } + m_hDCCount --; } -wxWindowDC::wxWindowDC(void) +/* + * wxClientDC + */ + +wxClientDC::wxClientDC(void) { m_canvas = NULL; } -wxWindowDC::wxWindowDC(wxWindow *the_canvas) +wxClientDC::wxClientDC(wxWindow *the_canvas) { m_canvas = the_canvas; -// m_hDC = (WXHDC) ::GetDCEx((HWND) the_canvas->GetHWND(), NULL, DCX_WINDOW); - m_hDC = (WXHDC) ::GetWindowDC((HWND) the_canvas->GetHWND() ); - m_hDCCount ++; +// BeginDrawing(); + m_hDC = (WXHDC) ::GetDC((HWND) the_canvas->GetHWND()); } -wxWindowDC::~wxWindowDC(void) +wxClientDC::~wxClientDC(void) { - if (m_canvas && m_hDC) +// EndDrawing(); + + if (m_canvas && (HDC) m_hDC) { SelectOldObjects(m_hDC); ::ReleaseDC((HWND) m_canvas->GetHWND(), (HDC) m_hDC); m_hDC = 0; } - m_hDCCount --; } +/* + * wxPaintDC + */ + wxPaintDC::wxPaintDC(void) { m_canvas = NULL; diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 273b9a61be..c3a7f12755 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -149,7 +149,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - m_noItems = n; + m_noItems = 0; m_hWnd = 0; m_selected = 0; @@ -227,6 +227,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Append(choices[ui]); } + /* Not needed -- done in Append #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { for (ui = 0; ui < (size_t)n; ui++) { @@ -238,6 +239,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, } } #endif +*/ if ( (m_windowStyle & wxLB_MULTIPLE) == 0 ) SendMessage(hwnd, LB_SETCURSEL, 0, 0); diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 5466c564ef..e68cb480f8 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -75,12 +75,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase) #endif BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase) -#if 0 // it seems like none of these functions does anything anyhow - EVT_SIZE(wxToolBar95::OnSize) - EVT_PAINT(wxToolBar95::OnPaint) - EVT_KILL_FOCUS(wxToolBar95::OnKillFocus) EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent) -#endif // 0 EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged) END_EVENT_TABLE() @@ -513,6 +508,20 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event) wxWindow::OnSysColourChanged(event); } +void wxToolBar95::OnMouseEvent(wxMouseEvent& event) +{ + if (event.RightDown()) + { + // For now, we don't have an id. Later we could + // try finding the tool. + OnRightClick((int)-1, event.GetX(), event.GetY()); + } + else + { + Default(); + } +} + // These are the default colors used to map the bitmap colors // to the current system colors diff --git a/src/stubs/dcclient.cpp b/src/stubs/dcclient.cpp index 46448bfa7a..4ba48ce40b 100644 --- a/src/stubs/dcclient.cpp +++ b/src/stubs/dcclient.cpp @@ -28,47 +28,50 @@ //----------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY -//IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC) -//IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) -IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) +IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) +IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) #endif +/* + * wxWindowDC + */ -wxPaintDC::wxPaintDC(void) +wxWindowDC::wxWindowDC(void) { }; -wxPaintDC::wxPaintDC( wxWindow *window ) +wxWindowDC::wxWindowDC( wxWindow *window ) { }; -wxPaintDC::~wxPaintDC(void) +wxWindowDC::~wxWindowDC(void) { }; -void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), +void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), wxColour* WXUNUSED(col), int WXUNUSED(style) ) { }; -bool wxPaintDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const +bool wxWindowDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const { return FALSE; }; -void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 ) +void wxWindowDC::DrawLine( long x1, long y1, long x2, long y2 ) { if (!Ok()) return; }; -void wxPaintDC::CrossHair( long x, long y ) +void wxWindowDC::CrossHair( long x, long y ) { if (!Ok()) return; }; -void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) +void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) { if (!Ok()) return; @@ -114,7 +117,7 @@ void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) }; -void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) +void wxWindowDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) { if (!Ok()) return; @@ -134,14 +137,14 @@ void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double if (m_pen.GetStyle() != wxTRANSPARENT) {}; }; -void wxPaintDC::DrawPoint( long x, long y ) +void wxWindowDC::DrawPoint( long x, long y ) { if (!Ok()) return; if (m_pen.GetStyle() != wxTRANSPARENT) {}; }; -void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset ) +void wxWindowDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset ) { if (!Ok()) return; @@ -156,7 +159,7 @@ void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset ) }; }; -void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset ) +void wxWindowDC::DrawLines( wxList *points, long xoffset, long yoffset ) { if (!Ok()) return; @@ -175,19 +178,19 @@ void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset ) }; }; -void wxPaintDC::DrawPolygon( int WXUNUSED(n), wxPoint WXUNUSED(points)[], +void wxWindowDC::DrawPolygon( int WXUNUSED(n), wxPoint WXUNUSED(points)[], long WXUNUSED(xoffset), long WXUNUSED(yoffset), int WXUNUSED(fillStyle) ) { if (!Ok()) return; }; -void wxPaintDC::DrawPolygon( wxList *WXUNUSED(lines), long WXUNUSED(xoffset), +void wxWindowDC::DrawPolygon( wxList *WXUNUSED(lines), long WXUNUSED(xoffset), long WXUNUSED(yoffset), int WXUNUSED(fillStyle) ) { if (!Ok()) return; }; -void wxPaintDC::DrawRectangle( long x, long y, long width, long height ) +void wxWindowDC::DrawRectangle( long x, long y, long width, long height ) { if (!Ok()) return; @@ -208,7 +211,7 @@ void wxPaintDC::DrawRectangle( long x, long y, long width, long height ) if (m_pen.GetStyle() != wxTRANSPARENT) {}; }; -void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius ) +void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius ) { if (!Ok()) return; @@ -259,7 +262,7 @@ void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, d }; }; -void wxPaintDC::DrawEllipse( long x, long y, long width, long height ) +void wxWindowDC::DrawEllipse( long x, long y, long width, long height ) { if (!Ok()) return; @@ -277,12 +280,12 @@ void wxPaintDC::DrawEllipse( long x, long y, long width, long height ) if (m_pen.GetStyle() != wxTRANSPARENT) {}; }; -bool wxPaintDC::CanDrawBitmap(void) const +bool wxWindowDC::CanDrawBitmap(void) const { return TRUE; }; -void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask ) +void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask ) { if (!Ok()) return; @@ -293,7 +296,7 @@ void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask ) }; -bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, +bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) ) { if (!Ok()) return FALSE; @@ -322,7 +325,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, return TRUE; }; -void wxPaintDC::DrawText( const wxString &text, long x, long y, bool +void wxWindowDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(use16) ) { if (!Ok()) return; @@ -331,12 +334,12 @@ WXUNUSED(use16) ) -bool wxPaintDC::CanGetTextExtent(void) const +bool wxWindowDC::CanGetTextExtent(void) const { return TRUE; }; -void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height, +void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *height, long *WXUNUSED(descent), long *WXUNUSED(externalLeading), wxFont *WXUNUSED(theFont), bool WXUNUSED(use16) ) { @@ -344,32 +347,32 @@ void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height }; -long wxPaintDC::GetCharWidth(void) +long wxWindowDC::GetCharWidth(void) { if (!Ok()) return 0; return 0; }; -long wxPaintDC::GetCharHeight(void) +long wxWindowDC::GetCharHeight(void) { if (!Ok()) return 0; return 0; }; -void wxPaintDC::Clear(void) +void wxWindowDC::Clear(void) { if (!Ok()) return; }; -void wxPaintDC::SetFont( const wxFont &font ) +void wxWindowDC::SetFont( const wxFont &font ) { if (!Ok()) return; m_font = font; }; -void wxPaintDC::SetPen( const wxPen &pen ) +void wxWindowDC::SetPen( const wxPen &pen ) { if (!Ok()) return; @@ -380,7 +383,7 @@ void wxPaintDC::SetPen( const wxPen &pen ) if (!m_pen.Ok()) return; }; -void wxPaintDC::SetBrush( const wxBrush &brush ) +void wxWindowDC::SetBrush( const wxBrush &brush ) { if (!Ok()) return; @@ -392,7 +395,7 @@ void wxPaintDC::SetBrush( const wxBrush &brush ) }; -void wxPaintDC::SetBackground( const wxBrush &brush ) +void wxWindowDC::SetBackground( const wxBrush &brush ) { if (!Ok()) return; @@ -404,12 +407,12 @@ void wxPaintDC::SetBackground( const wxBrush &brush ) }; -void wxPaintDC::SetLogicalFunction( int function ) +void wxWindowDC::SetLogicalFunction( int function ) { if (m_logicalFunction == function) return; }; -void wxPaintDC::SetTextForeground( const wxColour &col ) +void wxWindowDC::SetTextForeground( const wxColour &col ) { if (!Ok()) return; @@ -419,7 +422,7 @@ void wxPaintDC::SetTextForeground( const wxColour &col ) if (!m_textForegroundColour.Ok()) return; }; -void wxPaintDC::SetTextBackground( const wxColour &col ) +void wxWindowDC::SetTextBackground( const wxColour &col ) { if (!Ok()) return; @@ -429,7 +432,7 @@ void wxPaintDC::SetTextBackground( const wxColour &col ) if (!m_textBackgroundColour.Ok()) return; }; -void wxPaintDC::SetBackgroundMode( int mode ) +void wxWindowDC::SetBackgroundMode( int mode ) { m_backgroundMode = mode; @@ -438,17 +441,17 @@ void wxPaintDC::SetBackgroundMode( int mode ) } }; -void wxPaintDC::SetPalette( const wxPalette& WXUNUSED(palette) ) +void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) ) { }; -void wxPaintDC::SetClippingRegion( long x, long y, long width, long height ) +void wxWindowDC::SetClippingRegion( long x, long y, long width, long height ) { wxDC::SetClippingRegion( x, y, width, height ); }; -void wxPaintDC::DestroyClippingRegion(void) +void wxWindowDC::DestroyClippingRegion(void) { wxDC::DestroyClippingRegion(); @@ -569,7 +572,7 @@ static void wx_spline_draw_point_array(wxDC *dc) } } -void wxPaintDC::DrawSpline( wxList *points ) +void wxWindowDC::DrawSpline( wxList *points ) { wxPoint *p; double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; diff --git a/src/stubs/dcscreen.cpp b/src/stubs/dcscreen.cpp index 04bbf4f353..e03bbac0c8 100644 --- a/src/stubs/dcscreen.cpp +++ b/src/stubs/dcscreen.cpp @@ -16,7 +16,7 @@ #include "wx/dcscreen.h" #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxPaintDC) +IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) #endif // Create a DC representing the whole screen -- 2.47.2