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

A little bit of cleanup.

This commit is contained in:
Jeff Young 2019-06-09 12:47:37 +01:00
parent 193ec692a9
commit c3cc85eb1c
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/dialog_about/dialog_about.cpp
View File

@ -527,13 +527,6 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
aMsg << OFF; aMsg << OFF;
#endif #endif
aMsg << indent4 << "USE_WX_OVERLAY=";
#ifdef USE_WX_OVERLAY
aMsg << ON;
#else
aMsg << OFF;
#endif
aMsg << indent4 << "KICAD_SCRIPTING="; aMsg << indent4 << "KICAD_SCRIPTING=";
#ifdef KICAD_SCRIPTING #ifdef KICAD_SCRIPTING
aMsg << ON; aMsg << ON;

4
common/gr_basic.cpp
View File

@ -262,10 +262,6 @@ void GRSetDrawMode( wxDC* DC, GR_DRAWMODE draw_mode )
#endif #endif
else if( draw_mode & GR_COPY ) else if( draw_mode & GR_COPY )
DC->SetLogicalFunction( wxCOPY ); DC->SetLogicalFunction( wxCOPY );
#ifdef USE_WX_OVERLAY
DC->SetLogicalFunction( wxCOPY );
#endif
} }

5
include/eda_base_frame.h
View File

@ -41,7 +41,6 @@
#include <wx/laywin.h> #include <wx/laywin.h>
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#include <wx/docview.h> #include <wx/docview.h>
#include <fctsys.h> #include <fctsys.h>
#include <common.h> #include <common.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
@ -50,10 +49,6 @@
#include <tool/action_toolbar.h> #include <tool/action_toolbar.h>
#include <kiway_holder.h> #include <kiway_holder.h>
#ifdef USE_WX_OVERLAY
#include <wx/overlay.h>
#endif
// Option for main frames // Option for main frames
#define KICAD_DEFAULT_DRAWFRAME_STYLE wxDEFAULT_FRAME_STYLE | wxWANTS_CHARS #define KICAD_DEFAULT_DRAWFRAME_STYLE wxDEFAULT_FRAME_STYLE | wxWANTS_CHARS

9
include/eda_draw_frame.h
View File

@ -157,11 +157,6 @@ protected:
int m_MsgFrameHeight; int m_MsgFrameHeight;
#ifdef USE_WX_OVERLAY
// MAC Uses overlay to workaround the wxINVERT and wxXOR miss
wxOverlay m_overlay;
#endif
/// One-shot to avoid a recursive mouse event during hotkey movement /// One-shot to avoid a recursive mouse event during hotkey movement
bool m_movingCursorWithKeyboard; bool m_movingCursorWithKeyboard;
@ -699,10 +694,6 @@ public:
*/ */
virtual void SyncMenusAndToolbars() { }; virtual void SyncMenusAndToolbars() { };
bool GetShowAxis() const { return m_showAxis; }
bool GetShowGridAxis() const { return m_showGridAxis; }
bool GetShowOriginAxis() const { return m_showOriginAxis; }
virtual const BOX2I GetDocumentExtents() const; virtual const BOX2I GetDocumentExtents() const;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()