Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 79076b1b8254b19071519066ec401ff47bb7827a
|
From: David H. <no...@so...> - 2013-12-21 16:51:53
|
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 79076b1b8254b19071519066ec401ff47bb7827a (commit)
from 26bdfe4b53d218513dcaffd530f914754a4738f6 (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/79076b1b8254b19071519066ec401ff47bb7827a
commit 79076b1b8254b19071519066ec401ff47bb7827a
Author: dghart <da...@4P...>
Date: Sat Dec 21 16:51:42 2013 +0000
Type fix
diff --git a/LiteEditor/editor_options_comments_doxygen.wxcp b/LiteEditor/editor_options_comments_doxygen.wxcp
index 6d6a0be..4e8c882 100644
--- a/LiteEditor/editor_options_comments_doxygen.wxcp
+++ b/LiteEditor/editor_options_comments_doxygen.wxcp
@@ -698,6 +698,14 @@
"type": "string",
"m_label": "Max Length:",
"m_value": "0"
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Directories:",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Files:",
+ "m_value": false
}],
"m_events": [],
"m_children": []
@@ -848,6 +856,14 @@
"type": "string",
"m_label": "Max Length:",
"m_value": "0"
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Directories:",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Files:",
+ "m_value": false
}],
"m_events": [],
"m_children": []
@@ -919,7 +935,7 @@
}, {
"type": "multi-string",
"m_label": "Label:",
- "m_value": "The following macros are available:\\n$(CurrentFileName), $(CurrentFilePath),\\n$(User), $(Date), $(Name)\\n$(CurrentFileFullPath), $(CurrentFileExt),\\n$(ProjectName), $(WorksapceName)"
+ "m_value": "The following macros are available:\\n$(CurrentFileName), $(CurrentFilePath),\\n$(User), $(Date), $(Name)\\n$(CurrentFileFullPath), $(CurrentFileExt),\\n$(ProjectName), $(WorkspaceName)"
}, {
"type": "string",
"m_label": "Wrap:",
diff --git a/LiteEditor/editor_options_comments_doxygen_liteeditor_bitmaps.cpp b/LiteEditor/editor_options_comments_doxygen_liteeditor_bitmaps.cpp
index fad4bb6..507c77a 100644
--- a/LiteEditor/editor_options_comments_doxygen_liteeditor_bitmaps.cpp
+++ b/LiteEditor/editor_options_comments_doxygen_liteeditor_bitmaps.cpp
@@ -1,48 +1,48 @@
-//
-// This file was automatically generated by wxrc, do not edit by hand.
-//
-
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-
-#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
-#else
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFile(name, data, size)
-#endif
-
-static size_t xml_res_size_0 = 108;
-static unsigned char xml_res_file_0[] = {
-60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
-110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
-115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
-47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
-47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
-46,48,46,49,34,47,62,10};
-
-void wxCB83BInitBitmapResources()
-{
-
- // Check for memory FS. If not present, load the handler:
- {
- wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
- wxFileSystem fsys;
- wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
- wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
- if (f) delete f;
- else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
- }
-
- XRC_ADD_FILE(wxT("XRC_resource/editor_options_comments_doxygen_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_editor_options_comments_doxygen_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/editor_options_comments_doxygen_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_editor_options_comments_doxygen_liteeditor_bitmaps.xrc"));
-}
+//
+// This file was automatically generated by wxrc, do not edit by hand.
+//
+
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#include <wx/filesys.h>
+#include <wx/fs_mem.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/xrc/xh_all.h>
+
+#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
+#else
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFile(name, data, size)
+#endif
+
+static size_t xml_res_size_0 = 108;
+static unsigned char xml_res_file_0[] = {
+60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
+110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
+115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
+47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
+47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
+46,48,46,49,34,47,62,10};
+
+void wxCB83BInitBitmapResources()
+{
+
+ // Check for memory FS. If not present, load the handler:
+ {
+ wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
+ wxFileSystem fsys;
+ wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
+ wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
+ if (f) delete f;
+ else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
+ }
+
+ XRC_ADD_FILE(wxT("XRC_resource/editor_options_comments_doxygen_liteeditor_bitmaps.cpp$_home_david_devel_git_CL_LiteEditor_editor_options_comments_doxygen_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/editor_options_comments_doxygen_liteeditor_bitmaps.cpp$_home_david_devel_git_CL_LiteEditor_editor_options_comments_doxygen_liteeditor_bitmaps.xrc"));
+}
diff --git a/LiteEditor/editorsettingscommentsdoxygenpanelbase.cpp b/LiteEditor/editorsettingscommentsdoxygenpanelbase.cpp
index 027148c..ae54805 100644
--- a/LiteEditor/editorsettingscommentsdoxygenpanelbase.cpp
+++ b/LiteEditor/editorsettingscommentsdoxygenpanelbase.cpp
@@ -63,7 +63,14 @@ EditorSettingsCommentsDoxygenPanelBase::EditorSettingsCommentsDoxygenPanelBase(w
fgSizer1->Add(m_staticText4, 0, wxALL|wxALIGN_RIGHT|wxALIGN_TOP, 5);
m_textCtrlClassPattern = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_MULTILINE);
+ #ifdef __WXMSW__
+ // To get the newer version of the font on MSW, we use font wxSYS_DEFAULT_GUI_FONT with family set to wxFONTFAMILY_TELETYPE
+ wxFont m_textCtrlClassPatternFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ m_textCtrlClassPatternFont.SetFamily(wxFONTFAMILY_TELETYPE);
+ #else
wxFont m_textCtrlClassPatternFont = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT);
+ m_textCtrlClassPatternFont.SetFamily(wxFONTFAMILY_TELETYPE);
+ #endif
m_textCtrlClassPattern->SetFont(m_textCtrlClassPatternFont);
fgSizer1->Add(m_textCtrlClassPattern, 1, wxALL|wxEXPAND, 5);
@@ -73,13 +80,27 @@ EditorSettingsCommentsDoxygenPanelBase::EditorSettingsCommentsDoxygenPanelBase(w
fgSizer1->Add(m_staticText5, 0, wxALL|wxALIGN_RIGHT|wxALIGN_TOP, 5);
m_textCtrlFunctionPattern = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_MULTILINE);
+ #ifdef __WXMSW__
+ // To get the newer version of the font on MSW, we use font wxSYS_DEFAULT_GUI_FONT with family set to wxFONTFAMILY_TELETYPE
+ wxFont m_textCtrlFunctionPatternFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ m_textCtrlFunctionPatternFont.SetFamily(wxFONTFAMILY_TELETYPE);
+ #else
wxFont m_textCtrlFunctionPatternFont = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT);
+ m_textCtrlFunctionPatternFont.SetFamily(wxFONTFAMILY_TELETYPE);
+ #endif
m_textCtrlFunctionPattern->SetFont(m_textCtrlFunctionPatternFont);
fgSizer1->Add(m_textCtrlFunctionPattern, 1, wxALL|wxEXPAND, 5);
- m_staticText1 = new wxStaticText(this, wxID_ANY, _("The following macros are available:\n$(CurrentFileName), $(CurrentFilePath),\n$(User), $(Date), $(Name)\n$(CurrentFileFullPath), $(CurrentFileExt),\n$(ProjectName), $(WorksapceName)"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticText1 = new wxStaticText(this, wxID_ANY, _("The following macros are available:\n$(CurrentFileName), $(CurrentFilePath),\n$(User), $(Date), $(Name)\n$(CurrentFileFullPath), $(CurrentFileExt),\n$(ProjectName), $(WorkspaceName)"), wxDefaultPosition, wxSize(-1, -1), 0);
+ #ifdef __WXMSW__
+ // To get the newer version of the font on MSW, we use font wxSYS_DEFAULT_GUI_FONT with family set to wxFONTFAMILY_TELETYPE
+ wxFont m_staticText1Font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ m_staticText1Font.SetFamily(wxFONTFAMILY_TELETYPE);
+ #else
wxFont m_staticText1Font = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT);
+ m_staticText1Font.SetFamily(wxFONTFAMILY_TELETYPE);
+ #endif
m_staticText1->SetFont(m_staticText1Font);
bSizer2->Add(m_staticText1, 0, wxALL|wxEXPAND, 5);
diff --git a/LiteEditor/editorsettingscommentsdoxygenpanelbase.h b/LiteEditor/editorsettingscommentsdoxygenpanelbase.h
index a264357..0d7a416 100644
--- a/LiteEditor/editorsettingscommentsdoxygenpanelbase.h
+++ b/LiteEditor/editorsettingscommentsdoxygenpanelbase.h
@@ -1,28 +1,3 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : editorsettingscommentsdoxygenpanelbase.h
-//
-// -------------------------------------------------------------------------
-// A
-// _____ _ _ _ _
-// / __ \ | | | | (_) |
-// | / \/ ___ __| | ___| | _| |_ ___
-// | | / _ \ / _ |/ _ \ | | | __/ _ )
-// | \__/\ (_) | (_| | __/ |___| | || __/
-// \____/\___/ \__,_|\___\_____/_|\__\___|
-//
-// F i l e
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
// Do not modify this file by hand!
@@ -35,6 +10,7 @@
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_bmp.h>
#include <wx/panel.h>
+#include <wx/artprov.h>
#include <wx/sizer.h>
#include <wx/checkbox.h>
#include <wx/statline.h>
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/editor_options_comments_doxygen.wxcp | 18 ++++-
...options_comments_doxygen_liteeditor_bitmaps.cpp | 96 ++++++++++----------
.../editorsettingscommentsdoxygenpanelbase.cpp | 23 +++++-
.../editorsettingscommentsdoxygenpanelbase.h | 26 +-----
4 files changed, 88 insertions(+), 75 deletions(-)
hooks/post-receive
--
codelite
|
