diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index 04bc371fa8..ec0b3cd9ec 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -40,7 +40,7 @@
#include <tool/tool_dispatcher.h>
#include <tool/tool_manager.h>
-#ifdef __WXDEBUG__
+#ifdef PROFILE
#include <profile.h>
#endif /* PROFILE */
@@ -160,7 +160,7 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
if( m_drawing )
return;
-#ifdef __WXDEBUG__
+#ifdef PROFILE
PROF_COUNTER totalRealTime;
#endif /* PROFILE */
@@ -213,7 +213,7 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
wxString( err.what() ) );
}
-#ifdef __WXDEBUG__
+#ifdef PROFILE
totalRealTime.Stop();
wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::onPaint(): %.1f ms", totalRealTime.msecs() );
#endif /* PROFILE */
diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp
index 2591ba6792..9e2b158e7c 100644
--- a/eeschema/dialogs/dialog_print_using_printer.cpp
+++ b/eeschema/dialogs/dialog_print_using_printer.cpp
@@ -330,7 +330,7 @@ bool SCH_PRINTOUT::OnBeginDocument( int startPage, int endPage )
if( !wxPrintout::OnBeginDocument( startPage, endPage ) )
return false;
-#ifdef __WXDEBUG__
+#ifdef DEBUG
wxLogDebug( wxT( "Printer name: " ) +
m_parent->GetPageSetupData().GetPrintData().GetPrinterName() );
wxLogDebug( wxT( "Paper ID: %d" ),
diff --git a/eeschema/dialogs/dialog_print_using_printer_base.fbp b/eeschema/dialogs/dialog_print_using_printer_base.fbp
index a277cff864..378a4c188c 100644
--- a/eeschema/dialogs/dialog_print_using_printer_base.fbp
+++ b/eeschema/dialogs/dialog_print_using_printer_base.fbp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="13" />
+ <FileVersion major="1" minor="15" />
<object class="Project" expanded="1">
- <property name="class_decoration"></property>
+ <property name="class_decoration" />
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
@@ -16,9 +16,9 @@
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_print_schematic</property>
- <property name="namespace"></property>
+ <property name="namespace" />
<property name="path">.</property>
- <property name="precompiled_header"></property>
+ <property name="precompiled_header" />
<property name="relative_path">1</property>
<property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
@@ -29,67 +29,67 @@
<object class="Dialog" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
- <property name="bg"></property>
- <property name="center"></property>
- <property name="context_help"></property>
+ <property name="bg" />
+ <property name="center" />
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
- <property name="extra_style"></property>
- <property name="fg"></property>
- <property name="font"></property>
+ <property name="extra_style" />
+ <property name="fg" />
+ <property name="font" />
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="minimum_size">-1,-1</property>
<property name="name">DIALOG_PRINT_USING_PRINTER_BASE</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Print</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnActivate"></event>
- <event name="OnActivateApp"></event>
- <event name="OnAuiFindManager"></event>
- <event name="OnAuiPaneButton"></event>
- <event name="OnAuiPaneClose"></event>
- <event name="OnAuiPaneMaximize"></event>
- <event name="OnAuiPaneRestore"></event>
- <event name="OnAuiRender"></event>
- <event name="OnChar"></event>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnActivate" />
+ <event name="OnActivateApp" />
+ <event name="OnAuiFindManager" />
+ <event name="OnAuiPaneButton" />
+ <event name="OnAuiPaneClose" />
+ <event name="OnAuiPaneMaximize" />
+ <event name="OnAuiPaneRestore" />
+ <event name="OnAuiRender" />
+ <event name="OnChar" />
<event name="OnClose">OnCloseWindow</event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnHibernate"></event>
- <event name="OnIconize"></event>
- <event name="OnIdle"></event>
- <event name="OnInitDialog"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnHibernate" />
+ <event name="OnIconize" />
+ <event name="OnIdle" />
+ <event name="OnInitDialog" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bMainSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
@@ -98,7 +98,7 @@
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bleftSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
@@ -111,83 +111,83 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">1</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Print sheet &reference and title block</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_checkReference</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
<property name="tooltip">Print (or not) the Frame references.</property>
- <property name="validator_data_type"></property>
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnCheckBox"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnCheckBox" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -199,83 +199,83 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">1</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Print in &black and white only</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_checkMonochrome</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnCheckBox"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnCheckBox" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
</object>
@@ -289,76 +289,76 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticline1</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
+ <property name="size" />
<property name="style">wxLI_HORIZONTAL</property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -366,7 +366,7 @@
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bbuttonsSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
@@ -379,17 +379,17 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
@@ -397,65 +397,65 @@
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Page Setup...</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_buttonPageSetup</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<event name="OnButtonClick">OnPageSetup</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -481,17 +481,17 @@
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_sdbSizer1</property>
<property name="permission">protected</property>
<event name="OnApplyButtonClick">OnPrintPreview</event>
- <event name="OnCancelButtonClick"></event>
- <event name="OnContextHelpButtonClick"></event>
- <event name="OnHelpButtonClick"></event>
- <event name="OnNoButtonClick"></event>
- <event name="OnOKButtonClick"></event>
- <event name="OnSaveButtonClick"></event>
- <event name="OnYesButtonClick"></event>
+ <event name="OnCancelButtonClick" />
+ <event name="OnContextHelpButtonClick" />
+ <event name="OnHelpButtonClick" />
+ <event name="OnNoButtonClick" />
+ <event name="OnOKButtonClick" />
+ <event name="OnSaveButtonClick" />
+ <event name="OnYesButtonClick" />
</object>
</object>
</object>
diff --git a/include/profile.h b/include/profile.h
index 84103bad73..2e1334a4e5 100644
--- a/include/profile.h
+++ b/include/profile.h
@@ -28,8 +28,8 @@
* @brief Simple profiling functions for measuring code execution time.
*/
-#ifndef __TPROFILE_H
-#define __TPROFILE_H
+#ifndef TPROFILE_H
+#define TPROFILE_H
#include <chrono>
#include <string>
@@ -207,4 +207,4 @@ private:
*/
unsigned GetRunningMicroSecs();
-#endif
+#endif // TPROFILE_H