github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore, ide: gtk fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5693 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-01-01 13:05:27 +00:00
parent 06479a5369
commit a12b316cb4
8 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/GtkClip.cpp
View file

@ -5,7 +5,7 @@
NAMESPACE_UPP
#define LLOG(x) DLOG(x)
#define LLOG(x) // DLOG(x)
void Ctrl::GtkSelectionDataSet(GtkSelectionData *selection_data, const String& fmt, const String& data)
{

2
uppsrc/CtrlCore/GtkEvent.cpp
View file

@ -8,7 +8,7 @@
NAMESPACE_UPP
#define LLOG(x) LOG(x)
#define LLOG(x) // DLOG(x)
#define LOG_EVENTS
bool Ctrl::EventMouseValid;

12
uppsrc/ide/About.cpp
View file

@ -16,10 +16,14 @@ Size MakeLogo(Ctrl& parent, Array<Ctrl>& ctrl)
Label& v1 = ctrl.Create<Label>();
l.SetImage(logo);
Size sz = Size(isz.cx, isz.cy + 80);
v = IDE_VERSION;
if(sizeof(void *) == 8) {
v = IDE_VERSION " (64 bit)";
}
String h;
h = IDE_VERSION;
if(sizeof(void *) == 8)
h << " (64 bit)";
#ifdef GUI_GTK
h << " (Gtk)";
#endif
v = h;
v.RightPos(10, Ctrl::MINSIZE).TopPos(70, 40);
l.Add(v);
v.SetFont(Arial(20));

1
uppsrc/ide/Browser/Browser.h
View file

@ -40,6 +40,7 @@ const CppItem *GetCodeRefItem(const String& ref);
int GetMatchLen(const char *s, const char *t);
enum { WITHBODY = 33 };
inline Font BrowserFont()

2
uppsrc/ide/ide.cpp
View file

@ -36,6 +36,8 @@ void Ide::MakeTitle()
if(NormalizePath(editfile) == NormalizePath(bookmark[i].file))
title << Format(" <%d>", i);
title << " { " << GetVarsName() << " }";
if(isscanning)
title << " (scanning files)";
Title(title.ToWString());
}

1
uppsrc/ide/ide.h
View file

@ -739,6 +739,7 @@ public:
VectorMap<String, String> abbr;
int issaving;
int isscanning;
// ------------------------------------

5
uppsrc/ide/idewin.cpp
View file

@ -525,6 +525,7 @@ Ide::Ide()
output_per_assembly = true;
issaving = 0;
isscanning = 0;
}
Ide::~Ide()
@ -904,8 +905,12 @@ void AppMain___()
ide.LoadLastMain();
if(clset || ide.OpenMainPackage()) {
ide.SaveLastMain();
ide.isscanning++;
ide.MakeTitle();
SyncRefs();
ide.FileSelected();
ide.isscanning--;
ide.MakeTitle();
if(!IdeExit)
ide.Run();
ide.SaveConfigOnTime();

1
uppsrc/ide/init
View file

@ -17,6 +17,5 @@
#include "TextDiffCtrl/init"
#include "TabBar/init"
#include "ide\Img/init"
#include "Gtk/init"
#include "ide\SrcUpdater/init"
#endif