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

Minor fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1106 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-04-27 17:48:02 +00:00
parent a840b5fdc8
commit c088dcd9db
10 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlLib/FileSel.cpp
View file

@ -64,6 +64,7 @@ Image GetFileIcon(const char *path, bool dir, bool force, bool large)
m.file = "x." + ext;
return MakeImage(m);
}
#endif
#ifdef PLATFORM_X11

8
uppsrc/Draw/Draw.h
View file

@ -942,16 +942,8 @@ public:
#endif
private: //Deprecated
FontInfo GetFontInfo(byte charset, Font font = StdFont());
FontInfo GetFontInfo(Font font = StdFont());
FontInfo GetFontInfoW(Font font = StdFont());
Size GetTextSize(const wchar *text, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, font, n); }
Size GetTextSize(const WString& text, Font font = StdFont()) { return UPP::GetTextSize(text, font); }
Size GetTextSize(const char *text, byte charset, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, charset, font); }
Size GetTextSize(const char *text, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, font, n); }
Size GetTextSize(const String& text, Font font = StdFont()) { return UPP::GetTextSize(text, font); }
private:
Draw(const Draw&);
void operator=(const Draw&);

16
uppsrc/Draw/DrawText.cpp
View file

@ -294,11 +294,11 @@ void FontInfo::Retain(const FontInfo& f)
charset = f.charset;
}
FontInfo Draw::GetFontInfo(byte charset, Font font) {
FontInfo Draw::GetFontInfoW(Font font) {
DrawLock __;
LTIMING("GetFontInfo");
if(charset == CHARSET_DEFAULT)
charset = GetDefaultCharset();
byte charset = CHARSET_UNICODE;
if(lastFont.IsEqual(charset, font, 0, device))
return lastFont;
#ifdef PLATFORM_WIN32
@ -312,16 +312,6 @@ FontInfo Draw::GetFontInfo(byte charset, Font font) {
return fi;
}
FontInfo Draw::GetFontInfo(Font font)
{
return GetFontInfo(CHARSET_DEFAULT, font);
}
FontInfo Draw::GetFontInfoW(Font font)
{
return GetFontInfo(CHARSET_UNICODE, font);
}
void Draw::SetFont(Font font, int angle) {
DrawLock __;
LLOG("Set font: " << font << " face: " << font.GetFaceName());

4
uppsrc/TDraw/util.cpp
View file

@ -751,12 +751,12 @@ void DrawPolyPolyPolygon(Draw& draw, const Point *vertices, int vertex_count,
// TIMING("DrawPolyPolygon/stream");
Vector<Point> out_vertices;
Vector<int> out_subpolygon_counts, out_polygon_counts;
StreamPolyPolyPolygon(draw.DrawingOp(wPolyPolyPolygon),
/* StreamPolyPolyPolygon(draw.DrawingOp(wPolyPolyPolygon),
out_vertices, vertices, vertex_count,
out_subpolygon_counts, subpolygon_counts, subpolygon_count_count,
out_polygon_counts, disjunct_polygon_counts, disjunct_polygon_count_count,
color, width, outline, pattern, doxor);
return;
*/ return;
}
// TIMING("DrawPolyPolygon/hdc");
bool is_xor = !IsNull(doxor);

6
uppsrc/ide/Debuggers/Code.cpp
View file

@ -48,13 +48,13 @@ void Pdb::Sync0()
{
stop = false;
const CONTEXT& context = threads.Get((int)~threadlist).context;
#ifdef CPU_32
#ifdef CPU_32
adr_t eip = context.Eip;
adr_t ebp = context.Ebp;
#else
#else
adr_t eip = context.Rip;
adr_t ebp = context.Rbp;
#endif
#endif
adr_t spmax = threads.Get(event.dwThreadId).sp;
framelist.Clear();
frame.Clear();

4
uppsrc/ide/Debuggers/Visualise.cpp
View file

@ -233,8 +233,8 @@ Pdb::Visual Pdb::Visualise(const String& exp)
return r;
}
void Pdb::VisualDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style)
const
void Pdb::VisualDisplay::Paint(Draw& w, const Rect& r, const Value& q,
Color ink, Color paper, dword style) const
{
int x = r.left;
int y = r.top + (r.Height() - Draw::GetStdFontCy()) / 2;

3
uppsrc/plugin/jpg/jpgupp.cpp
View file

@ -671,7 +671,8 @@ void JPGEncoder::WriteLineRaw(const byte *s)
Image JPGRaster::GetExifThumbnail()
{
ASSERT(data);
return StreamRaster::LoadStringAny(data->GetThumbnail());
StringStream ss(data->GetThumbnail());
return StreamRaster::LoadStringAny(ss);
}
END_UPP_NAMESPACE

2
uppsrc/plugin/pcx/init
View file

@ -1,4 +1,6 @@
#ifndef _plugin_pcx_icpp_init_stub
#define _plugin_pcx_icpp_init_stub
#define BLITZ_INDEX__ F7436A22E881D6898946270473975CEA8
#include "pcxreg.icpp"
#undef BLITZ_INDEX__
#endif

2
uppsrc/plugin/pcx/pcx.upp
View file

@ -1,3 +1,5 @@
description "\3770,128,128";
file
pcx.h,
pcxhdr.h,

3
uppsrc/plugin/tif/tifupp.cpp
View file

@ -342,7 +342,8 @@ static void BltPack4(byte *dest, const byte *src, unsigned count)
static tsize_t ReadStream(thandle_t fd, tdata_t buf, tsize_t size)
{
Stream *stream = reinterpret_cast<Stream *>(fd);
ASSERT(stream->IsOpen());
if(!stream->IsOpen())
return 0;
// RLOG("TiffStream::TIFRaster::Data & " << (int)wrapper.stream.GetPos() << ", count = " << size
// << ", end = " << (int)(wrapper.stream.GetPos() + size));
return stream->Get(buf, size);