Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. c2d61cace8a1d97ec7a94951dffbea9501441e2f
|
From: Eran I. <no...@so...> - 2014-01-15 10:11:23
|
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 c2d61cace8a1d97ec7a94951dffbea9501441e2f (commit)
from c77d6efee94ebd7c8e05aa9e050092b9d076a80c (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/c2d61cace8a1d97ec7a94951dffbea9501441e2f
commit c2d61cace8a1d97ec7a94951dffbea9501441e2f
Author: Eran <era...@gm...>
Date: Wed Jan 15 12:11:10 2014 +0200
Fixed: local workspace settings should now get saved again
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 08385ee..8b5820e 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -149,7 +149,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/editorsettingslocalbase.cpp b/LiteEditor/editorsettingslocalbase.cpp
index 03259ea..cf6f424 100644
--- a/LiteEditor/editorsettingslocalbase.cpp
+++ b/LiteEditor/editorsettingslocalbase.cpp
@@ -313,6 +313,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_whitespaceStyleEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::whitespaceStyleUpdateUI), NULL, this);
m_choiceEOLEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::choiceEOLUpdateUI), NULL, this);
m_fileEncodingEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::fileEncodingUpdateUI), NULL, this);
+ m_button19->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
@@ -332,5 +333,6 @@ LocalEditorSettingsbase::~LocalEditorSettingsbase()
m_whitespaceStyleEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::whitespaceStyleUpdateUI), NULL, this);
m_choiceEOLEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::choiceEOLUpdateUI), NULL, this);
m_fileEncodingEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::fileEncodingUpdateUI), NULL, this);
+ m_button19->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
diff --git a/LiteEditor/editorsettingslocalbase.h b/LiteEditor/editorsettingslocalbase.h
index 997fd32..dc241c5 100644
--- a/LiteEditor/editorsettingslocalbase.h
+++ b/LiteEditor/editorsettingslocalbase.h
@@ -84,6 +84,7 @@ protected:
virtual void whitespaceStyleUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void choiceEOLUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void fileEncodingUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
+ virtual void OnOK(wxCommandEvent& event) { event.Skip(); }
public:
LocalEditorSettingsbase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Local Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
diff --git a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
index 63d7857..eae0dc2 100644
--- a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
+++ b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
@@ -1,298 +1,298 @@
-//
-// 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 = 353;
-static unsigned char xml_res_file_0[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,175,200,55,5,138,233,0,0,0,25,
-116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,
-97,103,101,82,101,97,100,121,113,201,101,60,0,0,0,243,73,68,65,84,56,203,
-99,252,255,255,63,3,37,128,137,129,66,64,177,1,44,48,70,121,121,249,255,
-127,255,254,49,252,249,243,7,142,127,255,254,13,199,191,126,253,130,211,
-32,188,119,239,94,70,144,62,70,74,195,0,238,130,206,45,239,174,148,251,
-8,233,192,248,177,177,177,215,145,109,68,199,103,206,156,209,68,49,224,
-199,239,191,12,153,139,158,92,189,117,251,107,200,222,102,245,235,64,69,
-138,184,52,131,48,12,128,189,208,178,249,197,127,17,110,54,134,79,223,127,
-51,156,190,243,245,204,195,91,95,226,78,77,213,187,78,140,23,224,97,144,
-179,248,197,149,87,239,191,51,221,189,250,41,248,236,76,253,235,158,158,
-158,87,96,182,253,252,249,19,110,51,204,91,15,31,62,212,65,241,194,183,
-159,255,24,86,229,41,106,193,189,244,227,135,10,186,179,145,99,3,195,5,
-20,199,130,183,183,247,127,124,129,134,156,38,64,248,243,231,207,84,78,
-7,182,182,182,255,177,5,22,178,173,31,62,124,96,196,25,11,3,150,153,0,9,
-38,9,133,50,72,142,137,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 551;
-static unsigned char xml_res_file_1[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,1,201,73,68,65,84,120,218,140,83,187,74,67,65,16,157,125,68,13,4,137,
-8,34,26,2,106,33,66,16,76,42,43,237,84,16,31,117,240,7,244,55,252,6,177,
-17,139,144,210,36,138,69,210,68,237,85,68,20,17,95,144,136,136,141,41,2,
-34,241,222,117,102,179,187,185,49,41,156,203,178,187,103,207,156,157,153,
-157,203,148,82,64,118,116,124,252,233,121,94,148,246,140,1,16,76,107,58,
-101,52,16,180,56,173,133,16,181,149,229,229,129,38,9,71,174,80,80,214,138,
-231,207,170,155,5,113,195,7,9,198,108,36,31,239,111,112,121,95,133,100,
-172,15,126,60,223,30,131,20,92,227,51,163,189,48,52,60,226,248,78,128,194,
-43,93,188,32,169,2,61,82,192,254,201,35,120,190,239,82,16,156,35,206,97,
-175,252,0,201,201,111,205,111,19,32,197,133,212,24,204,142,247,195,110,
-233,22,54,23,19,208,240,90,2,33,140,96,167,120,3,91,75,9,232,31,24,132,
-92,245,74,251,241,191,41,40,148,166,208,125,244,162,4,124,196,245,140,123,
-194,149,185,186,35,5,179,7,206,133,94,115,38,116,181,233,29,104,230,140,
-55,113,60,15,242,157,128,53,33,184,86,23,152,175,160,39,195,53,167,103,
-147,6,23,188,141,223,69,64,154,72,36,14,79,95,69,2,246,102,123,222,41,96,
-171,42,133,155,125,211,76,148,66,16,111,227,91,127,110,138,35,164,196,91,
-40,228,16,132,241,233,76,235,33,65,24,92,182,241,153,173,102,254,176,160,
-194,177,105,184,188,171,64,8,243,165,138,235,170,83,17,241,163,70,162,209,
-248,241,33,57,21,135,175,215,107,88,95,93,99,174,149,15,242,121,215,166,
-219,153,114,215,86,14,226,134,223,234,3,102,91,11,45,53,25,135,110,22,196,
-217,223,20,50,217,236,105,36,18,153,107,253,141,216,64,190,114,14,156,179,
-102,95,152,191,177,94,175,159,109,164,211,243,78,0,193,9,156,162,240,127,
-171,161,239,211,175,0,3,0,190,20,35,79,5,28,125,193,0,0,0,0,73,69,78,68,
-174,66,96,130};
-
-static size_t xml_res_size_2 = 3609;
-static unsigned char xml_res_file_2[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,18,0,0,11,18,1,210,221,126,
-252,0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67,
-67,32,112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61,
-247,222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38,
-42,33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142,
-142,128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202,
-251,225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157,
-179,207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196,
-198,225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126,
-60,60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15,
-234,66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166,
-0,64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39,
-127,230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101,
-136,68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45,
-0,48,73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133,
-41,0,4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16,
-231,42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40,
-206,73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243,
-204,0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182,
-14,95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116,
-126,209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160,
-117,247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69,
-161,144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103,
-194,95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129,
-71,4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252,
-183,11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154,
-140,243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62,
-223,53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226,
-247,0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253,
-71,160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0,
-68,160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96,
-54,132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134,
-205,176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184,
-14,61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136,
-1,98,138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20,
-81,34,75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186,
-145,59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185,
-168,55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26,
-61,140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196,
-108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176,
-86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97,
-30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194,
-39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214,
-18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164,
-84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100,
-107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33,
-242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52,
-229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161,
-182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149,
-211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210,
-203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155,
-24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235,
-152,231,153,15,153,111,85,88,42,182,42,124,21,145,202,10,149,74,149,38,
-149,27,42,47,84,169,170,166,170,222,170,11,85,243,85,203,84,143,169,94,
-83,125,174,70,85,51,83,227,169,9,212,150,171,85,170,157,80,235,83,27,83,
-103,169,59,168,135,170,103,168,111,84,63,164,126,89,253,137,6,89,195,76,
-195,79,67,164,81,160,177,95,227,188,198,32,11,99,25,179,120,44,33,107,13,
-171,134,117,129,53,196,38,177,205,217,124,118,42,187,152,253,29,187,139,
-61,170,169,161,57,67,51,74,51,87,179,82,243,148,102,63,7,227,152,113,248,
-156,116,78,9,231,40,167,151,243,126,138,222,20,239,41,226,41,27,166,52,
-76,185,49,101,92,107,170,150,151,150,88,171,72,171,81,171,71,235,189,54,
-174,237,167,157,166,189,69,187,89,251,129,14,65,199,74,39,92,39,71,103,
-143,206,5,157,231,83,217,83,221,167,10,167,22,77,61,58,245,174,46,170,107,
-165,27,161,187,68,119,191,110,167,238,152,158,190,94,128,158,76,111,167,
-222,121,189,231,250,28,125,47,253,84,253,109,250,167,245,71,12,88,6,179,
-12,36,6,219,12,206,24,60,197,53,113,111,60,29,47,199,219,241,81,67,93,195,
-64,67,165,97,149,97,151,225,132,145,185,209,60,163,213,70,141,70,15,140,
-105,198,92,227,36,227,109,198,109,198,163,38,6,38,33,38,75,77,234,77,238,
-154,82,77,185,166,41,166,59,76,59,76,199,205,204,205,162,205,214,153,53,
-155,61,49,215,50,231,155,231,155,215,155,223,183,96,90,120,90,44,182,168,
-182,184,101,73,178,228,90,166,89,238,182,188,110,133,90,57,89,165,88,85,
-90,93,179,70,173,157,173,37,214,187,173,187,167,17,167,185,78,147,78,171,
-158,214,103,195,176,241,182,201,182,169,183,25,176,229,216,6,219,174,182,
-109,182,125,97,103,98,23,103,183,197,174,195,238,147,189,147,125,186,125,
-141,253,61,7,13,135,217,14,171,29,90,29,126,115,180,114,20,58,86,58,222,
-154,206,156,238,63,125,197,244,150,233,47,103,88,207,16,207,216,51,227,
-182,19,203,41,196,105,157,83,155,211,71,103,23,103,185,115,131,243,136,
-139,137,75,130,203,46,151,62,46,155,27,198,221,200,189,228,74,116,245,113,
-93,225,122,210,245,157,155,179,155,194,237,168,219,175,238,54,238,105,238,
-135,220,159,204,52,159,41,158,89,51,115,208,195,200,67,224,81,229,209,63,
-11,159,149,48,107,223,172,126,79,67,79,129,103,181,231,35,47,99,47,145,
-87,173,215,176,183,165,119,170,247,97,239,23,62,246,62,114,159,227,62,227,
-60,55,222,50,222,89,95,204,55,192,183,200,183,203,79,195,111,158,95,133,
-223,67,127,35,255,100,255,122,255,209,0,167,128,37,1,103,3,137,129,65,129,
-91,2,251,248,122,124,33,191,142,63,58,219,101,246,178,217,237,65,140,160,
-185,65,21,65,143,130,173,130,229,193,173,33,104,200,236,144,173,33,247,
-231,152,206,145,206,105,14,133,80,126,232,214,208,7,97,230,97,139,195,126,
-12,39,133,135,133,87,134,63,142,112,136,88,26,209,49,151,53,119,209,220,
-67,115,223,68,250,68,150,68,222,155,103,49,79,57,175,45,74,53,42,62,170,
-46,106,60,218,55,186,52,186,63,198,46,102,89,204,213,88,157,88,73,108,75,
-28,57,46,42,174,54,110,108,190,223,252,237,243,135,226,157,226,11,227,123,
-23,152,47,200,93,112,121,161,206,194,244,133,167,22,169,46,18,44,58,150,
-64,76,136,78,56,148,240,65,16,42,168,22,140,37,242,19,119,37,142,10,121,
-194,29,194,103,34,47,209,54,209,136,216,67,92,42,30,78,242,72,42,77,122,
-146,236,145,188,53,121,36,197,51,165,44,229,185,132,39,169,144,188,76,13,
-76,221,155,58,158,22,154,118,32,109,50,61,58,189,49,131,146,145,144,113,
-66,170,33,77,147,182,103,234,103,230,102,118,203,172,101,133,178,254,197,
-110,139,183,47,30,149,7,201,107,179,144,172,5,89,45,10,182,66,166,232,84,
-90,40,215,42,7,178,103,101,87,102,191,205,137,202,57,150,171,158,43,205,
-237,204,179,202,219,144,55,156,239,159,255,237,18,194,18,225,146,182,165,
-134,75,87,45,29,88,230,189,172,106,57,178,60,113,121,219,10,227,21,5,43,
-134,86,6,172,60,184,138,182,42,109,213,79,171,237,87,151,174,126,189,38,
-122,77,107,129,94,193,202,130,193,181,1,107,235,11,85,10,229,133,125,235,
-220,215,237,93,79,88,47,89,223,181,97,250,134,157,27,62,21,137,138,174,
-20,219,23,151,21,127,216,40,220,120,229,27,135,111,202,191,153,220,148,
-180,169,171,196,185,100,207,102,210,102,233,230,222,45,158,91,14,150,170,
-151,230,151,14,110,13,217,218,180,13,223,86,180,237,245,246,69,219,47,151,
-205,40,219,187,131,182,67,185,163,191,60,184,188,101,167,201,206,205,59,
-63,84,164,84,244,84,250,84,54,238,210,221,181,97,215,248,110,209,238,27,
-123,188,246,52,236,213,219,91,188,247,253,62,201,190,219,85,1,85,77,213,
-102,213,101,251,73,251,179,247,63,174,137,170,233,248,150,251,109,93,173,
-78,109,113,237,199,3,210,3,253,7,35,14,182,215,185,212,213,29,210,61,84,
-82,143,214,43,235,71,14,199,31,190,254,157,239,119,45,13,54,13,85,141,156,
-198,226,35,112,68,121,228,233,247,9,223,247,30,13,58,218,118,140,123,172,
-225,7,211,31,118,29,103,29,47,106,66,154,242,154,70,155,83,154,251,91,98,
-91,186,79,204,62,209,214,234,222,122,252,71,219,31,15,156,52,60,89,121,
-74,243,84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126,
-46,249,220,96,219,162,182,123,231,99,206,223,106,15,111,239,186,16,116,
-225,210,69,255,139,231,59,188,59,206,92,242,184,116,242,178,219,229,19,
-87,184,87,154,175,58,95,109,234,116,234,60,254,147,211,79,199,187,156,187,
-154,174,185,92,107,185,238,122,189,181,123,102,247,233,27,158,55,206,221,
-244,189,121,241,22,255,214,213,158,57,61,221,189,243,122,111,247,197,247,
-245,223,22,221,126,114,39,253,206,203,187,217,119,39,238,173,188,79,188,
-95,244,64,237,65,217,67,221,135,213,63,91,254,220,216,239,220,127,106,192,
-119,160,243,209,220,71,247,6,133,131,207,254,145,245,143,15,67,5,143,153,
-143,203,134,13,134,235,158,56,62,57,57,226,63,114,253,233,252,167,67,207,
-100,207,38,158,23,254,162,254,203,174,23,22,47,126,248,213,235,215,206,
-209,152,209,161,151,242,151,147,191,109,124,165,253,234,192,235,25,175,
-219,198,194,198,30,190,201,120,51,49,94,244,86,251,237,193,119,220,119,
-29,239,163,223,15,79,228,124,32,127,40,255,104,249,177,245,83,208,167,251,
-147,25,147,147,255,4,3,152,243,252,99,51,45,219,0,0,0,32,99,72,82,77,0,
-0,122,37,0,0,128,131,0,0,249,255,0,0,128,233,0,0,117,48,0,0,234,96,0,0,
-58,152,0,0,23,111,146,95,197,70,0,0,3,68,73,68,65,84,120,218,60,147,203,
-107,156,85,28,134,159,115,206,55,201,132,204,100,102,160,73,26,29,205,197,
-90,107,110,77,67,21,33,137,90,13,110,181,118,37,136,98,2,218,40,37,85,40,
-184,112,33,24,80,112,97,66,131,46,218,162,232,66,177,32,180,255,128,120,
-69,148,46,106,90,141,153,166,73,154,219,76,205,164,233,36,157,219,119,126,
-231,184,168,233,187,127,31,120,22,143,242,222,179,187,137,169,201,61,192,
-230,123,227,39,221,199,159,125,250,115,60,22,27,136,199,227,20,10,133,242,
-216,43,175,214,77,76,77,26,43,126,207,251,239,188,157,219,253,168,93,192,
-196,212,228,62,99,204,95,10,118,172,200,176,49,230,199,209,55,94,175,7,
-248,226,236,57,140,214,207,148,202,229,51,38,48,15,198,234,234,7,78,140,
-140,252,113,15,48,49,53,217,97,140,153,61,250,226,209,200,236,149,43,100,
-174,47,184,214,116,90,239,109,106,70,107,88,203,230,88,94,93,163,163,173,
-181,242,104,119,119,237,197,11,23,112,98,123,223,61,49,62,19,0,104,173,
-135,141,49,193,250,141,21,82,137,20,143,247,39,181,247,224,188,195,139,
-162,185,177,145,166,198,70,128,218,236,242,50,38,48,84,170,225,211,192,
-204,61,133,15,167,79,95,75,183,180,60,116,127,203,125,160,192,3,222,123,
-196,90,130,32,130,82,119,157,87,215,215,217,220,218,146,241,145,209,0,64,
-125,48,249,73,4,136,104,173,243,253,189,189,81,99,12,0,183,110,223,102,
-45,155,173,40,165,10,70,235,100,235,3,233,72,180,54,138,181,150,63,175,
-94,37,209,208,208,180,184,178,86,212,90,235,124,60,22,219,238,238,233,142,
-122,192,138,80,42,151,184,190,176,88,9,195,48,61,62,50,218,84,42,151,159,
-93,90,94,9,173,8,160,232,234,234,162,90,13,255,137,214,6,219,26,208,29,
-109,237,90,137,199,90,193,138,229,78,177,136,247,126,238,212,241,177,13,
-128,83,199,199,126,178,34,197,106,24,34,78,240,226,104,111,107,75,121,241,
-74,123,208,235,185,44,133,157,2,86,4,43,130,49,1,74,171,246,179,223,124,
-29,1,248,252,252,183,157,64,157,243,30,107,45,219,119,182,201,222,204,225,
-52,4,78,36,85,19,137,212,45,46,46,109,236,127,120,191,81,10,180,209,36,
-19,137,250,124,126,179,240,209,244,244,14,144,108,136,199,2,177,22,15,44,
-44,45,209,245,200,129,84,96,12,193,193,206,206,138,19,95,185,225,87,23,
-54,242,27,251,82,169,20,10,72,37,147,42,22,143,71,173,181,209,154,72,4,
-163,13,34,194,173,173,45,106,35,53,146,170,79,108,37,234,234,209,14,207,
-165,153,203,61,98,109,71,60,30,71,196,253,175,226,80,64,36,8,240,222,99,
-197,98,157,35,22,139,81,42,151,204,247,191,255,50,116,100,104,16,237,67,
-135,247,254,128,181,86,172,21,170,97,133,108,46,135,136,197,57,135,56,135,
-181,66,46,151,35,12,67,68,132,48,180,197,98,177,220,14,160,5,79,127,79,
-207,121,15,163,115,153,57,151,153,203,132,155,249,252,119,127,207,206,186,
-106,24,226,196,145,185,150,161,88,46,95,202,100,50,91,243,243,243,78,161,
-78,14,15,61,245,37,128,14,109,21,20,60,118,232,208,87,98,109,179,21,73,
-28,238,235,59,102,140,209,74,41,172,88,0,158,56,216,119,216,121,151,46,
-85,42,233,35,3,131,103,158,123,114,240,110,141,43,107,235,252,240,219,175,
-104,99,120,233,249,23,218,128,24,176,247,181,183,222,124,185,185,165,229,
-24,74,169,127,111,102,47,158,155,154,62,13,108,3,59,222,251,197,221,156,
-255,27,0,50,132,177,177,162,209,252,223,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_3 = 471;
-static unsigned char xml_res_file_3[] = {
-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,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,
-61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,105,110,
-100,101,110,116,34,62,101,100,105,116,111,114,115,101,116,116,105,110,103,
-115,108,111,99,97,108,98,97,115,101,95,102,111,114,109,98,117,105,108,100,
-101,114,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,105,99,111,
-110,115,95,105,110,100,101,110,116,46,112,110,103,60,47,111,98,106,101,
-99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,
-119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,97,114,103,
-105,110,115,34,62,101,100,105,116,111,114,115,101,116,116,105,110,103,115,
-108,111,99,97,108,98,97,115,101,95,102,111,114,109,98,117,105,108,100,101,
-114,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,105,99,111,110,
-115,95,109,97,114,103,105,110,115,46,112,110,103,60,47,111,98,106,101,99,
-116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
-120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,105,115,99,34,
-62,101,100,105,116,111,114,115,101,116,116,105,110,103,115,108,111,99,97,
-108,98,97,115,101,95,102,111,114,109,98,117,105,108,100,101,114,95,98,105,
-116,109,97,112,115,46,99,112,112,36,46,46,95,105,99,111,110,115,95,109,
-105,115,99,46,112,110,103,60,47,111,98,106,101,99,116,62,10,60,47,114,101,
-115,111,117,114,99,101,62,10};
-
-void wxC2ED4InitBitmapResources()
-{
-
- // 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/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_indent.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_margins.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_misc.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$C__src_codelitegit_formbuilder_editorsettingslocalbase_formbuilder_bitmaps.xrc"), xml_res_file_3, xml_res_size_3, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$C__src_codelitegit_formbuilder_editorsettingslocalbase_formbuilder_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 = 353;
+static unsigned char xml_res_file_0[] = {
+137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
+0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,175,200,55,5,138,233,0,0,0,25,
+116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,
+97,103,101,82,101,97,100,121,113,201,101,60,0,0,0,243,73,68,65,84,56,203,
+99,252,255,255,63,3,37,128,137,129,66,64,177,1,44,48,70,121,121,249,255,
+127,255,254,49,252,249,243,7,142,127,255,254,13,199,191,126,253,130,211,
+32,188,119,239,94,70,144,62,70,74,195,0,238,130,206,45,239,174,148,251,
+8,233,192,248,177,177,177,215,145,109,68,199,103,206,156,209,68,49,224,
+199,239,191,12,153,139,158,92,189,117,251,107,200,222,102,245,235,64,69,
+138,184,52,131,48,12,128,189,208,178,249,197,127,17,110,54,134,79,223,127,
+51,156,190,243,245,204,195,91,95,226,78,77,213,187,78,140,23,224,97,144,
+179,248,197,149,87,239,191,51,221,189,250,41,248,236,76,253,235,158,158,
+158,87,96,182,253,252,249,19,110,51,204,91,15,31,62,212,65,241,194,183,
+159,255,24,86,229,41,106,193,189,244,227,135,10,186,179,145,99,3,195,5,
+20,199,130,183,183,247,127,124,129,134,156,38,64,248,243,231,207,84,78,
+7,182,182,182,255,177,5,22,178,173,31,62,124,96,196,25,11,3,150,153,0,9,
+38,9,133,50,72,142,137,0,0,0,0,73,69,78,68,174,66,96,130};
+
+static size_t xml_res_size_1 = 551;
+static unsigned char xml_res_file_1[] = {
+137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
+0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
+65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
+0,0,1,201,73,68,65,84,120,218,140,83,187,74,67,65,16,157,125,68,13,4,137,
+8,34,26,2,106,33,66,16,76,42,43,237,84,16,31,117,240,7,244,55,252,6,177,
+17,139,144,210,36,138,69,210,68,237,85,68,20,17,95,144,136,136,141,41,2,
+34,241,222,117,102,179,187,185,49,41,156,203,178,187,103,207,156,157,153,
+157,203,148,82,64,118,116,124,252,233,121,94,148,246,140,1,16,76,107,58,
+101,52,16,180,56,173,133,16,181,149,229,229,129,38,9,71,174,80,80,214,138,
+231,207,170,155,5,113,195,7,9,198,108,36,31,239,111,112,121,95,133,100,
+172,15,126,60,223,30,131,20,92,227,51,163,189,48,52,60,226,248,78,128,194,
+43,93,188,32,169,2,61,82,192,254,201,35,120,190,239,82,16,156,35,206,97,
+175,252,0,201,201,111,205,111,19,32,197,133,212,24,204,142,247,195,110,
+233,22,54,23,19,208,240,90,2,33,140,96,167,120,3,91,75,9,232,31,24,132,
+92,245,74,251,241,191,41,40,148,166,208,125,244,162,4,124,196,245,140,123,
+194,149,185,186,35,5,179,7,206,133,94,115,38,116,181,233,29,104,230,140,
+55,113,60,15,242,157,128,53,33,184,86,23,152,175,160,39,195,53,167,103,
+147,6,23,188,141,223,69,64,154,72,36,14,79,95,69,2,246,102,123,222,41,96,
+171,42,133,155,125,211,76,148,66,16,111,227,91,127,110,138,35,164,196,91,
+40,228,16,132,241,233,76,235,33,65,24,92,182,241,153,173,102,254,176,160,
+194,177,105,184,188,171,64,8,243,165,138,235,170,83,17,241,163,70,162,209,
+248,241,33,57,21,135,175,215,107,88,95,93,99,174,149,15,242,121,215,166,
+219,153,114,215,86,14,226,134,223,234,3,102,91,11,45,53,25,135,110,22,196,
+217,223,20,50,217,236,105,36,18,153,107,253,141,216,64,190,114,14,156,179,
+102,95,152,191,177,94,175,159,109,164,211,243,78,0,193,9,156,162,240,127,
+171,161,239,211,175,0,3,0,190,20,35,79,5,28,125,193,0,0,0,0,73,69,78,68,
+174,66,96,130};
+
+static size_t xml_res_size_2 = 3609;
+static unsigned char xml_res_file_2[] = {
+137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
+0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,18,0,0,11,18,1,210,221,126,
+252,0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67,
+67,32,112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61,
+247,222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38,
+42,33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142,
+142,128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202,
+251,225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157,
+179,207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196,
+198,225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126,
+60,60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15,
+234,66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166,
+0,64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39,
+127,230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101,
+136,68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45,
+0,48,73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133,
+41,0,4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16,
+231,42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40,
+206,73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243,
+204,0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182,
+14,95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116,
+126,209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160,
+117,247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69,
+161,144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103,
+194,95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129,
+71,4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252,
+183,11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154,
+140,243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62,
+223,53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226,
+247,0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253,
+71,160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0,
+68,160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96,
+54,132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134,
+205,176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184,
+14,61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136,
+1,98,138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20,
+81,34,75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186,
+145,59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185,
+168,55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26,
+61,140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196,
+108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176,
+86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97,
+30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194,
+39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214,
+18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164,
+84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100,
+107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33,
+242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52,
+229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161,
+182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149,
+211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210,
+203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155,
+24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235,
... 199 lines suppressed ...
hooks/post-receive
--
codelite
|
