haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove creation on the fly of a wxPaintEvent instance (final step). 

This is not allowed in 3.1.4 wxWidgets.
This commit is contained in:
jean-pierre charras 2020-07-15 12:58:43 +02:00
parent 1dc804232c
commit 6366aa3ede
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/gal/cairo/cairo_gal.cpp
View File

@ -40,6 +40,8 @@
#include <pixman.h> #include <pixman.h>
#include <id.h>
using namespace KIGFX; using namespace KIGFX;
@ -1303,6 +1305,17 @@ void CAIRO_GAL::endDrawing()
} }
void CAIRO_GAL::PostPaint()
{
// posts an event to m_paint_listener to ask for redraw the canvas.
if( paintListener )
{
wxPaintEvent redrawReqEvent;
wxPostEvent( paintListener, redrawReqEvent );
}
}
void CAIRO_GAL::ResizeScreen( int aWidth, int aHeight ) void CAIRO_GAL::ResizeScreen( int aWidth, int aHeight )
{ {
CAIRO_GAL_BASE::ResizeScreen( aWidth, aHeight ); CAIRO_GAL_BASE::ResizeScreen( aWidth, aHeight );

13
common/gal/opengl/opengl_gal.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KICAD, a free EDA CAD application.
* *
* Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de * Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
* Copyright (C) 2012-2018 Kicad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2012-2020 Kicad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2013-2017 CERN * Copyright (C) 2013-2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch> * @author Maciej Suminski <maciej.suminski@cern.ch>
* *
@ -352,6 +352,17 @@ wxString OPENGL_GAL::CheckFeatures( GAL_DISPLAY_OPTIONS& aOptions )
} }
void OPENGL_GAL::PostPaint()
{
// posts an event to m_paint_listener to ask for redraw the canvas.
if( paintListener )
{
wxPaintEvent redrawReqEvent;
wxPostEvent( paintListener, redrawReqEvent );
}
}
bool OPENGL_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions ) bool OPENGL_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
{ {
bool refresh = false; bool refresh = false;

11
include/gal/cairo/cairo_gal.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KICAD, a free EDA CAD application.
* *
* Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de * Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
* Copyright (C) 2012-2019 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2012-2020 Kicad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2017-2018 CERN * Copyright (C) 2017-2018 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch> * @author Maciej Suminski <maciej.suminski@cern.ch>
* *
@ -388,14 +388,7 @@ public:
* posts an event to m_paint_listener. A post is used so that the actual drawing * posts an event to m_paint_listener. A post is used so that the actual drawing
* function can use a device context type that is not specific to the wxEVT_PAINT event. * function can use a device context type that is not specific to the wxEVT_PAINT event.
*/ */
void PostPaint() void PostPaint();
{
if( paintListener )
{
wxPaintEvent redrawEvent;
wxPostEvent( paintListener, redrawEvent );
}
}
void SetMouseListener( wxEvtHandler* aMouseListener ) void SetMouseListener( wxEvtHandler* aMouseListener )
{ {

11
include/gal/opengl/opengl_gal.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KICAD, a free EDA CAD application.
* *
* Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de * Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
* Copyright (C) 2012 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2013-2017 CERN * Copyright (C) 2013-2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch> * @author Maciej Suminski <maciej.suminski@cern.ch>
* *
@ -252,14 +252,7 @@ public:
* posts an event to m_paint_listener. A post is used so that the actual drawing * posts an event to m_paint_listener. A post is used so that the actual drawing
* function can use a device context type that is not specific to the wxEVT_PAINT event. * function can use a device context type that is not specific to the wxEVT_PAINT event.
*/ */
void PostPaint() void PostPaint();
{
if( paintListener )
{
wxPaintEvent redrawEvent;
wxPostEvent( paintListener, redrawEvent );
}
}
void SetMouseListener( wxEvtHandler* aMouseListener ) void SetMouseListener( wxEvtHandler* aMouseListener )
{ {