Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-29 04:26:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Replace static void Fl_X::activate_window(Window) under X11 platform by void Fl_X11_Window_Driver::activate_window()

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11651 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-04-18 13:40:34 +00:00
parent 9df9ffdc4c
commit 516d0e5f9c
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/x.H
-1
View File
@@ -124,7 +124,6 @@ public:
int set_cursor(const Fl_RGB_Image*, int, int); int set_cursor(const Fl_RGB_Image*, int, int);
static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap); static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap);
static Fl_X* set_xid(Fl_Window*, Window); static Fl_X* set_xid(Fl_Window*, Window);
static void activate_window(Window w);
}; };
extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid() extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
src/Fl_x.cxx
+2 -1
View File
@@ -2145,7 +2145,8 @@ char Fl_Xlib_Graphics_Driver::can_do_alpha_blending() {
extern Fl_Window *fl_xfocus; extern Fl_Window *fl_xfocus;
void Fl_X::activate_window(Window w) { void Fl_X11_Window_Driver::activate_window() {
Window w = fl_xid(pWindow);
if (!Fl_X11_Screen_Driver::ewmh_supported()) if (!Fl_X11_Screen_Driver::ewmh_supported())
return; return;
src/drivers/X11/Fl_X11_Window_Driver.H
+1
View File
@@ -69,6 +69,7 @@ private:
void shape_alpha_(Fl_Image* img, int offset); void shape_alpha_(Fl_Image* img, int offset);
void flush_double(int erase_overlay); void flush_double(int erase_overlay);
void sendxjunk(); void sendxjunk();
void activate_window();
#ifdef USE_XDBE #ifdef USE_XDBE
char backbuffer_bad; char backbuffer_bad;
void flush_double_dbe(int erase_overlay); void flush_double_dbe(int erase_overlay);
src/drivers/X11/Fl_X11_Window_Driver.cxx
+1 -1
View File
@@ -190,7 +190,7 @@ void Fl_X11_Window_Driver::take_focus()
if (!Fl_X11_Screen_Driver::ewmh_supported()) if (!Fl_X11_Screen_Driver::ewmh_supported())
pWindow->show(); // Old WMs, XMapRaised pWindow->show(); // Old WMs, XMapRaised
else if (i) // New WMs use the NETWM attribute: else if (i) // New WMs use the NETWM attribute:
Fl_X::activate_window(i->xid); activate_window();
} }