From 0773a33ca04ef2d9602527e059071cf119396bf6 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Thu, 26 May 2011 19:17:01 +0000 Subject: [PATCH] Remove various bit of redundant code from the wxWebView sample source view dialog. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/web/web.cpp | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/samples/web/web.cpp b/samples/web/web.cpp index 7e010be1b1..7430c926e2 100644 --- a/samples/web/web.cpp +++ b/samples/web/web.cpp @@ -28,22 +28,10 @@ // -------------------------------------------------------------------------------------------------- // SOURCE VIEW FRAME // -------------------------------------------------------------------------------------------------- -enum -{ - MARGIN_LINE_NUMBERS, - //MARGIN_DIVIDER, - //MARGIN_FOLDING -}; class SourceViewDialog : public wxDialog { public: - - void onClose(wxCloseEvent& evt) - { - EndModal( GetReturnCode() ); - } - SourceViewDialog(wxWindow* parent, wxString source) : wxDialog(parent, wxID_ANY, "Source Code", wxDefaultPosition, wxSize(700,500), @@ -51,36 +39,26 @@ public: { wxStyledTextCtrl* text = new wxStyledTextCtrl(this, wxID_ANY); - //text->SetLexer(wxSTC_LEX_HTML); - text->SetMarginWidth (MARGIN_LINE_NUMBERS, 50); - text->StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (75, 75, 75) ); - text->StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (220, 220, 220)); - text->SetMarginType (MARGIN_LINE_NUMBERS, wxSTC_MARGIN_NUMBER); - - text->SetWrapMode (wxSTC_WRAP_WORD); - + text->SetMarginWidth(1, 30); + text->SetMarginType(1, wxSTC_MARGIN_NUMBER); text->SetText(source); text->StyleClearAll(); text->SetLexer(wxSTC_LEX_HTML); - text->StyleSetForeground (wxSTC_H_DOUBLESTRING, wxColour(255,0,0)); - text->StyleSetForeground (wxSTC_H_SINGLESTRING, wxColour(255,0,0)); - text->StyleSetForeground (wxSTC_H_ENTITY, wxColour(255,0,0)); - text->StyleSetForeground (wxSTC_H_TAG, wxColour(0,150,0)); - text->StyleSetForeground (wxSTC_H_TAGUNKNOWN, wxColour(0,150,0)); - text->StyleSetForeground (wxSTC_H_ATTRIBUTE, wxColour(0,0,150)); - text->StyleSetForeground (wxSTC_H_ATTRIBUTEUNKNOWN, wxColour(0,0,150)); - text->StyleSetForeground (wxSTC_H_COMMENT, wxColour(150,150,150)); + text->StyleSetForeground(wxSTC_H_DOUBLESTRING, wxColour(255,0,0)); + text->StyleSetForeground(wxSTC_H_SINGLESTRING, wxColour(255,0,0)); + text->StyleSetForeground(wxSTC_H_ENTITY, wxColour(255,0,0)); + text->StyleSetForeground(wxSTC_H_TAG, wxColour(0,150,0)); + text->StyleSetForeground(wxSTC_H_TAGUNKNOWN, wxColour(0,150,0)); + text->StyleSetForeground(wxSTC_H_ATTRIBUTE, wxColour(0,0,150)); + text->StyleSetForeground(wxSTC_H_ATTRIBUTEUNKNOWN, wxColour(0,0,150)); + text->StyleSetForeground(wxSTC_H_COMMENT, wxColour(150,150,150)); wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); sizer->Add(text, 1, wxEXPAND); SetSizer(sizer); - - Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(SourceViewDialog::onClose), NULL, this); } - - }; // -------------------------------------------------------------------------------------------------- -- 2.50.0