hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Reverted accidently commited stuff by Skiessi

Browse Source 
That's it.
This commit is contained in:
Tobias Doerffel
2009-04-14 16:30:27 +02:00
parent 86a6a63462
commit e08464124d
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H
View File

@@ -88,7 +88,7 @@ struct FL_EXPORT Fl_Menu_Item {
void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;}
void* user_data() const {return user_data_;}
void user_data(void* v) {user_data_ = v;}
long argument() const {return (long long)user_data_;}
long argument() const {return (long)user_data_;}
void argument(long v) {user_data_ = (void*)v;}
int shortcut() const {return shortcut_;}
void shortcut(int s) {shortcut_ = s;}

26
plugins/zynaddsubfx/fltk/FL/x.H
View File

@@ -65,10 +65,34 @@ extern FL_EXPORT int fl_screen;
extern FL_EXPORT XVisualInfo *fl_visual;
extern FL_EXPORT Colormap fl_colormap;
#if USE_XFT
// access to core fonts
FL_EXPORT XFontStruct* fl_xxfont();
class Fl_XFont_On_Demand
{
public:
Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }
Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x)
{ ptr = x.ptr; return *this; }
Fl_XFont_On_Demand& operator=(XFontStruct* p)
{ ptr = p; return *this; }
XFontStruct* value() { if (!ptr) { ptr = fl_xxfont(); } return ptr; }
operator XFontStruct*() { return value(); }
XFontStruct& operator*() { return *value(); }
XFontStruct* operator->() { return value(); }
bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; }
bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; }
private:
XFontStruct* ptr;
};
extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
#else
extern FL_EXPORT XFontStruct* fl_xfont;
#endif
// drawing functions:
extern FL_EXPORT GC fl_gc;
extern FL_EXPORT Window fl_window;
extern FL_EXPORT XFontStruct* fl_xfont;
extern FL_EXPORT void *fl_xftfont;
FL_EXPORT ulong fl_xpixel(Fl_Color i);
FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);