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

diff --git a/contrib/samples/stc/edit.cpp b/contrib/samples/stc/edit.cpp
index a402edc5218bbbca3d91cf9d015b200254fdf8c1..8c5393cd874ae0641025f28e13b621bc2c06530e 100644 (file)
--- 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;
     // 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);
 
     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")));
     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;
 
     // default fonts for all styles!
     int Nr;

diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp
index 7fa8e3f17dc4508e3195e331ebc053adaa97961e..9cc5cc88fa2a2d0873d085c16f00398edae547ae 100644 (file)
--- 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)
 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
                     wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) {
 
     // intitialize important variables

diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp
index a402edc5218bbbca3d91cf9d015b200254fdf8c1..8c5393cd874ae0641025f28e13b621bc2c06530e 100644 (file)
--- 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;
     // 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);
 
     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")));
     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;
 
     // default fonts for all styles!
     int Nr;

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 7fa8e3f17dc4508e3195e331ebc053adaa97961e..9cc5cc88fa2a2d0873d085c16f00398edae547ae 100644 (file)
--- 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)
 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
                     wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) {
 
     // intitialize important variables