Fixed stream test.

[wxWidgets.git] / contrib / samples / stc / edit.cpp

diff --git a/contrib/samples/stc/edit.cpp b/contrib/samples/stc/edit.cpp
index 5c0aef717d27535aaff3223365460f18f260c468..5a233bf158afe09db556ee27a603a224fb011f16 100644 (file)
--- a/contrib/samples/stc/edit.cpp
+++ b/contrib/samples/stc/edit.cpp
@@ -25,12 +25,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 #include <wx/file.h>     // raw file io support
 #include <wx/filename.h> // filename support
 
@@ -156,10 +156,7 @@ Edit::Edit (wxWindow *parent, wxWindowID id,
     // miscelaneous
     m_LineNrMargin = TextWidth (wxSTC_STYLE_LINENUMBER, _T("_999999"));
     m_FoldingMargin = 16;
-    SetMarginWidth (m_LineNrID,
-                    g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0);
     CmdKeyClear (wxSTC_KEY_TAB, 0); // this is done by the menu accelerator key
-    UsePopUp (0);
     SetLayoutCache (wxSTC_CACHE_PAGE);
 
 }
@@ -361,7 +358,7 @@ void Edit::OnCharAdded (wxStyledTextEvent &event) {
 // private functions
 wxString Edit::DeterminePrefs (const wxString &filename) {
 
-    LanguageInfo const* curInfo = NULL;
+    LanguageInfo const* curInfo;
 
     // determine language from filepatterns
     int languageNr;
@@ -409,8 +406,7 @@ bool Edit::InitializePrefs (const wxString &name) {
     SetMarginType (m_LineNrID, wxSTC_MARGIN_NUMBER);
     StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY")));
     StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE")));
-    SetMarginWidth (m_LineNrID,
-                    g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0);
+    SetMarginWidth (m_LineNrID, 0); // start out not visible
 
     // default fonts for all styles!
     int Nr;