diff --git a/common/dialogs/dialog_display_html_text_base.cpp b/common/dialogs/dialog_display_html_text_base.cpp index 503972a065..99c793916b 100644 --- a/common/dialogs/dialog_display_html_text_base.cpp +++ b/common/dialogs/dialog_display_html_text_base.cpp @@ -5,7 +5,7 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "dialogs/dialog_display_html_text_base.h" +#include "dialog_display_html_text_base.h" /////////////////////////////////////////////////////////////////////////// @@ -16,6 +16,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); + bMainSizer->SetMinSize( wxSize( 540,240 ) ); m_htmlWindow = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 5 ); diff --git a/common/dialogs/dialog_display_html_text_base.fbp b/common/dialogs/dialog_display_html_text_base.fbp index afa5ef6bdc..a444ec20f6 100644 --- a/common/dialogs/dialog_display_html_text_base.fbp +++ b/common/dialogs/dialog_display_html_text_base.fbp @@ -54,7 +54,7 @@ - -1,-1 + 540,240 bMainSizer wxVERTICAL none diff --git a/common/dialogs/dialog_display_html_text_base.h b/common/dialogs/dialog_display_html_text_base.h new file mode 100644 index 0000000000..bdcce47325 --- /dev/null +++ b/common/dialogs/dialog_display_html_text_base.h @@ -0,0 +1,49 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_DISPLAY_HTML_TEXT_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_DISPLAY_HTML_TEXT_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxHtmlWindow* m_htmlWindow; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + + // Virtual event handlers, overide them in your derived class + virtual void OnHTMLLinkClicked( wxHtmlLinkEvent& event ) { event.Skip(); } + + + public: + + DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_DISPLAY_HTML_TEXT_BASE(); + +}; + diff --git a/common/dialogs/html_message_box.cpp b/common/dialogs/html_message_box.cpp index 29103a8f2e..9c21ab7f1c 100644 --- a/common/dialogs/html_message_box.cpp +++ b/common/dialogs/html_message_box.cpp @@ -94,8 +94,6 @@ void HTML_MESSAGE_BOX::reload() background.GetAsString( wxC2S_HTML_SYNTAX ), foreground.GetAsString( wxC2S_HTML_SYNTAX ), m_source ) ); - - Layout(); }