Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. c8fc8a13b854aaa57bb9be3b31f193804aacd54a
|
From: Eran I. <no...@so...> - 2014-01-11 07:24:32
|
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 c8fc8a13b854aaa57bb9be3b31f193804aacd54a (commit)
from 524f5ffaeddd69ca05e8b2a289109d06f8a2acff (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/c8fc8a13b854aaa57bb9be3b31f193804aacd54a
commit c8fc8a13b854aaa57bb9be3b31f193804aacd54a
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 01:24:10 2014 -0800
Improved the CMake PLugin help tab on OSX
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index 1813074..8f071d7 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -265,7 +265,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_USE_TEXTCTRL"],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1681,7 +1681,7 @@
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxHW_SCROLLBAR_AUTO", "wxBORDER_STATIC"],
+ "m_styles": ["wxHW_SCROLLBAR_AUTO", "wxBORDER_THEME"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index d11f7c0..54fe09b 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -40,7 +40,7 @@ CMakeSettingsDialogBase::CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id
m_filePickerProgram = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1,-1), wxFLP_DEFAULT_STYLE|wxFLP_USE_TEXTCTRL);
m_filePickerProgram->SetToolTip(_("Path to cmake executable."));
- flexGridSizer->Add(m_filePickerProgram, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ flexGridSizer->Add(m_filePickerProgram, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_filePickerProgram->SetMinSize(wxSize(200,-1));
m_staticTextDefaultGenerator = new wxStaticText(this, wxID_ANY, _("Default Generator:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -160,7 +160,7 @@ CMakeHelpTabBase::CMakeHelpTabBase(wxWindow* parent, wxWindowID id, const wxPoin
wxBoxSizer* boxSizerText = new wxBoxSizer(wxVERTICAL);
m_splitterPageText->SetSizer(boxSizerText);
- m_htmlWinText = new wxHtmlWindow(m_splitterPageText, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxHW_SCROLLBAR_AUTO|wxBORDER_STATIC);
+ m_htmlWinText = new wxHtmlWindow(m_splitterPageText, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxHW_SCROLLBAR_AUTO|wxBORDER_THEME);
m_htmlWinText->SetPage(wxT(""));
boxSizerText->Add(m_htmlWinText, 1, wxALL|wxEXPAND, 0);
diff --git a/CMakePlugin/CMakePluginUi_bitmaps.cpp b/CMakePlugin/CMakePluginUi_bitmaps.cpp
index 3e8c72f..d8a5fca 100644
--- a/CMakePlugin/CMakePluginUi_bitmaps.cpp
+++ b/CMakePlugin/CMakePluginUi_bitmaps.cpp
@@ -1,98 +1,98 @@
-//
-// 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 = 843;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24,0,0,0,7,116,73,77,
-69,7,222,1,10,22,14,18,195,172,157,47,0,0,2,216,73,68,65,84,56,203,125,
-144,75,108,84,101,24,134,159,255,220,254,115,254,115,198,206,12,51,211,
-153,78,47,12,157,38,69,211,146,64,48,81,23,85,49,66,21,52,40,27,48,129,
-138,1,12,154,24,22,44,88,145,176,195,181,59,23,134,141,75,55,174,140,18,
-13,11,119,82,140,81,161,244,66,112,72,40,244,54,215,83,206,233,204,239,
-98,90,23,84,248,86,223,226,251,158,231,205,107,242,156,57,248,234,251,111,
-103,131,212,27,149,165,202,12,16,121,192,198,83,55,198,211,79,59,118,244,
-110,173,78,161,252,250,123,227,217,242,213,227,176,31,32,252,31,201,54,
-192,242,242,34,0,231,63,251,242,181,142,59,240,110,106,221,72,231,18,206,
-59,128,2,240,132,120,54,32,157,254,207,238,233,206,224,33,219,218,181,211,
-213,30,10,227,248,4,236,5,8,181,126,54,96,101,165,107,159,154,186,178,183,
-211,73,159,168,213,122,88,119,2,61,100,203,226,176,101,30,6,124,0,101,24,
-219,1,91,246,209,81,95,69,81,254,112,28,23,250,91,205,142,142,172,128,188,
-84,12,73,249,241,91,82,190,4,208,234,116,182,3,182,236,99,99,23,94,52,205,
-190,211,139,139,14,237,88,211,18,190,136,165,210,227,74,229,6,165,252,80,
-24,134,2,240,55,83,24,221,230,243,0,76,78,78,168,56,206,30,107,52,138,185,
-122,125,93,71,145,22,117,146,196,118,130,33,229,177,91,169,51,7,148,26,
-1,104,110,166,48,186,205,63,4,32,138,198,202,182,189,243,92,165,98,16,69,
-176,186,178,74,216,169,35,19,190,48,29,169,95,238,233,73,13,120,222,169,
-146,235,74,128,192,52,49,210,233,174,253,228,201,115,210,117,251,78,45,
-45,229,146,97,24,233,106,245,177,200,229,254,102,226,128,36,91,72,98,58,
-14,253,65,192,43,169,212,217,130,227,12,3,52,218,109,204,48,108,0,160,245,
-224,72,38,243,230,215,243,243,190,29,71,143,25,222,53,35,78,124,148,99,
-160,232,17,204,206,147,168,86,133,229,56,186,207,247,157,153,48,100,36,
-8,126,248,179,209,208,6,192,197,139,95,89,197,226,248,249,202,63,105,213,
-108,220,215,131,165,95,197,145,67,30,41,207,226,209,90,131,13,199,198,85,
-10,219,113,232,245,125,14,230,243,103,110,86,171,195,0,38,192,194,194,98,
-169,144,63,122,237,206,237,71,70,241,232,143,212,46,223,16,127,245,222,
-98,245,193,10,205,133,13,70,151,90,12,196,33,134,101,10,211,178,244,80,
-16,88,179,205,166,55,93,173,126,111,106,173,185,254,211,253,171,119,239,
-138,253,253,159,92,215,149,47,110,136,57,57,203,3,235,33,183,51,51,204,
-246,205,177,28,173,97,222,107,83,220,240,232,113,37,129,43,133,180,237,
-61,223,85,42,223,138,212,11,133,210,232,216,167,115,242,244,180,184,53,
-249,139,94,107,175,9,34,224,9,16,1,45,176,234,6,201,102,130,221,119,50,
-28,249,61,195,7,181,172,46,41,95,124,62,253,219,53,81,222,119,236,155,236,
-165,250,212,205,145,159,121,18,71,208,222,124,140,128,245,46,128,214,230,
-30,131,107,72,242,181,148,158,152,75,138,242,31,78,252,47,183,191,5,89,
-119,238,104,246,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 210;
-static unsigned char xml_res_file_1[] = {
-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,99,109,97,
-107,101,95,49,54,34,62,67,77,97,107,101,80,108,117,103,105,110,85,105,95,
-98,105,116,109,97,112,115,46,99,112,112,36,99,109,97,107,101,45,49,54,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 wxCrafterR3nJ3cInitBitmapResources()
-{
-
- // 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/CMakePluginUi_bitmaps.cpp$cmake-16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_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 = 843;
+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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
+0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24,0,0,0,7,116,73,77,
+69,7,222,1,10,22,14,18,195,172,157,47,0,0,2,216,73,68,65,84,56,203,125,
+144,75,108,84,101,24,134,159,255,220,254,115,254,115,198,206,12,51,211,
+153,78,47,12,157,38,69,211,146,64,48,81,23,85,49,66,21,52,40,27,48,129,
+138,1,12,154,24,22,44,88,145,176,195,181,59,23,134,141,75,55,174,140,18,
+13,11,119,82,140,81,161,244,66,112,72,40,244,54,215,83,206,233,204,239,
+98,90,23,84,248,86,223,226,251,158,231,205,107,242,156,57,248,234,251,111,
+103,131,212,27,149,165,202,12,16,121,192,198,83,55,198,211,79,59,118,244,
+110,173,78,161,252,250,123,227,217,242,213,227,176,31,32,252,31,201,54,
+192,242,242,34,0,231,63,251,242,181,142,59,240,110,106,221,72,231,18,206,
+59,128,2,240,132,120,54,32,157,254,207,238,233,206,224,33,219,218,181,211,
+213,30,10,227,248,4,236,5,8,181,126,54,96,101,165,107,159,154,186,178,183,
+211,73,159,168,213,122,88,119,2,61,100,203,226,176,101,30,6,124,0,101,24,
+219,1,91,246,209,81,95,69,81,254,112,28,23,250,91,205,142,142,172,128,188,
+84,12,73,249,241,91,82,190,4,208,234,116,182,3,182,236,99,99,23,94,52,205,
+190,211,139,139,14,237,88,211,18,190,136,165,210,227,74,229,6,165,252,80,
+24,134,2,240,55,83,24,221,230,243,0,76,78,78,168,56,206,30,107,52,138,185,
+122,125,93,71,145,22,117,146,196,118,130,33,229,177,91,169,51,7,148,26,
+1,104,110,166,48,186,205,63,4,32,138,198,202,182,189,243,92,165,98,16,69,
+176,186,178,74,216,169,35,19,190,48,29,169,95,238,233,73,13,120,222,169,
+146,235,74,128,192,52,49,210,233,174,253,228,201,115,210,117,251,78,45,
+45,229,146,97,24,233,106,245,177,200,229,254,102,226,128,36,91,72,98,58,
+14,253,65,192,43,169,212,217,130,227,12,3,52,218,109,204,48,108,0,160,245,
+224,72,38,243,230,215,243,243,190,29,71,143,25,222,53,35,78,124,148,99,
+160,232,17,204,206,147,168,86,133,229,56,186,207,247,157,153,48,100,36,
+8,126,248,179,209,208,6,192,197,139,95,89,197,226,248,249,202,63,105,213,
+108,220,215,131,165,95,197,145,67,30,41,207,226,209,90,131,13,199,198,85,
+10,219,113,232,245,125,14,230,243,103,110,86,171,195,0,38,192,194,194,98,
+169,144,63,122,237,206,237,71,70,241,232,143,212,46,223,16,127,245,222,
+98,245,193,10,205,133,13,70,151,90,12,196,33,134,101,10,211,178,244,80,
+16,88,179,205,166,55,93,173,126,111,106,173,185,254,211,253,171,119,239,
+138,253,253,159,92,215,149,47,110,136,57,57,203,3,235,33,183,51,51,204,
+246,205,177,28,173,97,222,107,83,220,240,232,113,37,129,43,133,180,237,
+61,223,85,42,223,138,212,11,133,210,232,216,167,115,242,244,180,184,53,
+249,139,94,107,175,9,34,224,9,16,1,45,176,234,6,201,102,130,221,119,50,
+28,249,61,195,7,181,172,46,41,95,124,62,253,219,53,81,222,119,236,155,236,
+165,250,212,205,145,159,121,18,71,208,222,124,140,128,245,46,128,214,230,
+30,131,107,72,242,181,148,158,152,75,138,242,31,78,252,47,183,191,5,89,
+119,238,104,246,0,0,0,0,73,69,78,68,174,66,96,130};
+
+static size_t xml_res_size_1 = 210;
+static unsigned char xml_res_file_1[] = {
+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,99,109,97,
+107,101,95,49,54,34,62,67,77,97,107,101,80,108,117,103,105,110,85,105,95,
+98,105,116,109,97,112,115,46,99,112,112,36,99,109,97,107,101,45,49,54,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 wxCrafterR3nJ3cInitBitmapResources()
+{
+
+ // 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/CMakePluginUi_bitmaps.cpp$cmake-16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
+ XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$_Users_eran_devl_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$_Users_eran_devl_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"));
+}
diff --git a/LiteEditor/theme_handler.cpp b/LiteEditor/theme_handler.cpp
index e385801..46b14cc 100644
--- a/LiteEditor/theme_handler.cpp
+++ b/LiteEditor/theme_handler.cpp
@@ -10,6 +10,10 @@
#include <wx/aui/framemanager.h>
#include "cl_aui_tb_are.h"
+#ifdef __WXMAC__
+#include <wx/srchctrl.h>
+#endif
+
#define CHECK_POINTER(p) if ( !p ) return;
ThemeHandler::ThemeHandler()
@@ -73,6 +77,12 @@ void ThemeHandler::OnEditorThemeChanged(wxCommandEvent& e)
void ThemeHandler::DoUpdateColours(wxWindow* win, const wxColour& bg, const wxColour& fg)
{
+#ifdef __WXMAC__
+ if ( dynamic_cast<wxSearchCtrl*>(win) ) {
+ // On OSX, this looks bad...
+ // so dont alter its colours, so we simply do nothing here
+ } else
+#endif
if ( dynamic_cast<wxTreeCtrl*>(win) || dynamic_cast<wxListBox*>(win) || dynamic_cast<wxDataViewCtrl*>(win) || dynamic_cast<wxTextCtrl*>(win) || dynamic_cast<wxListCtrl*>(win)) {
win->SetBackgroundColour( bg );
win->SetForegroundColour( fg );
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMakePlugin.wxcp | 4 +-
CMakePlugin/CMakePluginUi.cpp | 4 +-
CMakePlugin/CMakePluginUi_bitmaps.cpp | 196 ++++++++++++++++----------------
LiteEditor/theme_handler.cpp | 10 ++
4 files changed, 112 insertions(+), 102 deletions(-)
hooks/post-receive
--
codelite
|
