From e411268c8c418359242299ac7c3568d7862c5934 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 6 Feb 2004 17:36:28 +0000 Subject: [PATCH] Start out with the line numbers not shown. Don't use the default size for the AppFrame. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/stc/edit.cpp | 5 +---- contrib/samples/stc/stctest.cpp | 2 +- samples/stc/edit.cpp | 5 +---- samples/stc/stctest.cpp | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/contrib/samples/stc/edit.cpp b/contrib/samples/stc/edit.cpp index a402edc521..8c5393cd87 100644 --- a/contrib/samples/stc/edit.cpp +++ b/contrib/samples/stc/edit.cpp @@ -156,8 +156,6 @@ 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 SetLayoutCache (wxSTC_CACHE_PAGE); @@ -408,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; diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp index 7fa8e3f17d..9cc5cc88fa 100644 --- a/contrib/samples/stc/stctest.cpp +++ b/contrib/samples/stc/stctest.cpp @@ -289,7 +289,7 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) END_EVENT_TABLE () AppFrame::AppFrame (const wxString &title) - : wxFrame ((wxFrame *)NULL, -1, title, wxDefaultPosition, wxDefaultSize, + : wxFrame ((wxFrame *)NULL, -1, title, wxDefaultPosition, wxSize(750,550), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { // intitialize important variables diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp index a402edc521..8c5393cd87 100644 --- a/samples/stc/edit.cpp +++ b/samples/stc/edit.cpp @@ -156,8 +156,6 @@ 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 SetLayoutCache (wxSTC_CACHE_PAGE); @@ -408,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; diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 7fa8e3f17d..9cc5cc88fa 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -289,7 +289,7 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) END_EVENT_TABLE () AppFrame::AppFrame (const wxString &title) - : wxFrame ((wxFrame *)NULL, -1, title, wxDefaultPosition, wxDefaultSize, + : wxFrame ((wxFrame *)NULL, -1, title, wxDefaultPosition, wxSize(750,550), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { // intitialize important variables -- 2.47.2