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

diff --git a/samples/web/web.cpp b/samples/web/web.cpp
index 7e010be1b1cff9422112b68abb3efeb9dc22641e..7430c926e263f6f2a8645d2d62791a1a6b30334c 100644 (file)
--- 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);
     }
-    
-    
 };
 
 // --------------------------------------------------------------------------------------------------