From: Eran I. <no...@so...> - 2014-01-10 09:31:09
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "codelite". The branch, master has been updated via 01e9ad1445f85649660e086e0c53ead90d453f4e (commit) via cabf3cdb524702231a64178f5fd27673a25b5a43 (commit) from ddb49421c9355eda174f884ee0f521b7f43f445c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://sourceforge.net/p/codelite/codelitegit/ci/01e9ad1445f85649660e086e0c53ead90d453f4e commit 01e9ad1445f85649660e086e0c53ead90d453f4e Author: Eran <era...@gm...> Date: Fri Jan 10 11:30:55 2014 +0200 Limit the effect of the command line macro GTK_USE_NATIVEBOOK to GTK only diff --git a/Interfaces/cl_defs.h b/Interfaces/cl_defs.h index 761c9d2..8f32b22 100644 --- a/Interfaces/cl_defs.h +++ b/Interfaces/cl_defs.h @@ -32,10 +32,12 @@ # endif # define CL_USE_NATIVEBOOK 0 #else + // MSW / OSX and the rest of the world # define CL_USE_NATIVEBOOK 0 #endif -// Allow override the default CL_USE_NATIVEBOOK by cmake variable +// Allow override the default CL_USE_NATIVEBOOK by cmake variable (GTK only) +#ifdef __WXGTK__ #if GTK_USE_NATIVEBOOK # ifdef CL_USE_NATIVEBOOK # undef CL_USE_NATIVEBOOK @@ -47,6 +49,7 @@ # endif # define CL_USE_NATIVEBOOK 0 #endif +#endif #if wxVERSION_NUMBER < 2904 # define CL_USE_NEW_BUILD_TAB 0 https://sourceforge.net/p/codelite/codelitegit/ci/cabf3cdb524702231a64178f5fd27673a25b5a43 commit cabf3cdb524702231a64178f5fd27673a25b5a43 Author: Eran <era...@gm...> Date: Fri Jan 10 11:01:26 2014 +0200 Removed the "Style" field from the status bar diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp index 4b23792..4d8f394 100644 --- a/LiteEditor/cl_editor.cpp +++ b/LiteEditor/cl_editor.cpp @@ -961,9 +961,7 @@ void LEditor::OnSciUpdateUI(wxStyledTextEvent &event) << wxT(", Col ") << GetColumn(pos) << wxT(", Pos ") - << pos - << ", Style " - << GetStyleAt(pos); + << pos; message << ", "; ----------------------------------------------------------------------- Summary of changes: Interfaces/cl_defs.h | 5 ++++- LiteEditor/cl_editor.cpp | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- codelite |