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

Remove unused m_host variable 

This variable isn't needed anymore after 5f53019290
pushed dark mode handling into the HTML window itself.
This commit is contained in:
Ian McInerney 2021-10-18 00:29:40 +01:00
parent 280743d9e9
commit 5817a8b5f4
6 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_configure_paths.cpp
View File

@ -621,7 +621,7 @@ void DIALOG_CONFIGURE_PATHS::OnHelp( wxCommandEvent& event )
}
m_helpDialog = new HTML_MESSAGE_BOX( nullptr, this, _( "Environment Variable Help" ) );
m_helpDialog = new HTML_MESSAGE_BOX( nullptr, _( "Environment Variable Help" ) );
m_helpDialog->SetDialogSizeInDU( 400, 250 );
m_helpDialog->AddHTML_Text( msg );

21
common/dialogs/html_message_box.cpp
View File

@ -29,28 +29,9 @@
#include <dialogs/html_message_box.h>
HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, wxWindow* aHost, const wxString& aTitle ) :
DIALOG_DISPLAY_HTML_TEXT_BASE( aParent, wxID_ANY, aTitle, wxDefaultPosition, wxDefaultSize ),
m_host( aHost )
{
m_htmlWindow->SetLayoutDirection( wxLayout_LeftToRight );
ListClear();
Center();
m_sdbSizer1OK->SetDefault();
reload();
Bind( wxEVT_SYS_COLOUR_CHANGED,
wxSysColourChangedEventHandler( HTML_MESSAGE_BOX::onThemeChanged ), this );
}
HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle,
const wxPoint& aPosition, const wxSize& aSize ) :
DIALOG_DISPLAY_HTML_TEXT_BASE( nullptr, wxID_ANY, aTitle, aPosition, aSize ),
m_host( aParent )
DIALOG_DISPLAY_HTML_TEXT_BASE( aParent, wxID_ANY, aTitle, aPosition, aSize )
{
m_htmlWindow->SetLayoutDirection( wxLayout_LeftToRight );
ListClear();

2
eeschema/dialogs/dialog_bom.cpp
View File

@ -458,7 +458,7 @@ void DIALOG_BOM::OnHelp( wxCommandEvent& event )
return;
}
m_helpWindow = new HTML_MESSAGE_BOX( nullptr, this, _( "Bill of Material Generation Help" ) );
m_helpWindow = new HTML_MESSAGE_BOX( nullptr, _( "Bill of Material Generation Help" ) );
m_helpWindow->SetDialogSizeInDU( 500, 350 );
wxString html_txt;

2
eeschema/sch_text.cpp
View File

@ -1721,7 +1721,7 @@ HTML_MESSAGE_BOX* SCH_TEXT::ShowSyntaxHelp( wxWindow* aParentWindow )
#include "sch_text_help_md.h"
;
HTML_MESSAGE_BOX* dlg = new HTML_MESSAGE_BOX( nullptr, aParentWindow, _( "Syntax Help" ) );
HTML_MESSAGE_BOX* dlg = new HTML_MESSAGE_BOX( nullptr, _( "Syntax Help" ) );
wxSize sz( 320, 320 );
dlg->SetMinSize( dlg->ConvertDialogToPixels( sz ) );

3
include/dialogs/html_message_box.h
View File

@ -35,8 +35,6 @@ public:
const wxPoint& aPosition = wxDefaultPosition,
const wxSize& aSize = wxDefaultSize );
HTML_MESSAGE_BOX( wxWindow* aParent, wxWindow* aHost, const wxString& aTitle );
~HTML_MESSAGE_BOX() override;
/**
@ -92,7 +90,6 @@ protected:
virtual void OnCharHook( wxKeyEvent& aEvt ) override;
private:
wxWindow* m_host;
wxString m_source;
};

2
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -540,7 +540,7 @@ void PANEL_SETUP_RULES::OnSyntaxHelp( wxHyperlinkEvent& aEvent )
msg.Replace( "Ctrl+", "Cmd+" );
#endif
m_helpWindow = new HTML_MESSAGE_BOX( nullptr, this, _( "Syntax Help" ) );
m_helpWindow = new HTML_MESSAGE_BOX( nullptr, _( "Syntax Help" ) );
m_helpWindow->SetDialogSizeInDU( 320, 320 );
wxString html_txt;