mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Small refactoring

Browse Source
This commit is contained in:
Sanel Zukan 2011-10-18 08:45:55 +00:00
parent 77c2ce9739
commit f5e6768f47
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ede-desktop/ede-desktop.cpp
View File

@ -145,14 +145,14 @@ static void desktop_message_handler(int action, Window xid, void *data) {
} }
} }
Desktop::Desktop() : DESKTOP_WINDOW(0, 0, 100, 100, "") { Desktop::Desktop() : EDE_DESKTOP_WINDOW(0, 0, 100, 100, "") {
selection_x = selection_y = 0; selection_x = selection_y = 0;
moving = false; moving = false;
do_dirwatch = true; do_dirwatch = true;
#ifdef USE_EDELIB_WINDOW #ifdef USE_EDELIB_WINDOW
edelib::foreign_callback_add(this, "ede-desktop", settings_changed_cb); edelib::foreign_callback_add(this, "ede-desktop", settings_changed_cb);
/* DESKTOP_WINDOW::single_bufer(true); */ /* EDE_DESKTOP_WINDOW::single_bufer(true); */
#endif #endif
selbox = new SelectionOverlay; selbox = new SelectionOverlay;
@ -260,7 +260,7 @@ Desktop* Desktop::instance(void) {
void Desktop::show(void) { void Desktop::show(void) {
if(shown()) if(shown())
return DESKTOP_WINDOW::show(); return EDE_DESKTOP_WINDOW::show();
window_xid_create(this, make_me_desktop); window_xid_create(this, make_me_desktop);
} }
@ -873,7 +873,7 @@ void Desktop::draw(void) {
*/ */
clear_xoverlay(); clear_xoverlay();
DESKTOP_WINDOW::draw(); EDE_DESKTOP_WINDOW::draw();
E_DEBUG(E_STRLOC ": REDRAW ALL\n"); E_DEBUG(E_STRLOC ": REDRAW ALL\n");
} }
@ -1089,7 +1089,7 @@ int Desktop::handle(int event) {
case FL_ENTER: case FL_ENTER:
case FL_LEAVE: case FL_LEAVE:
case FL_MOVE: case FL_MOVE:
return DESKTOP_WINDOW::handle(event); return EDE_DESKTOP_WINDOW::handle(event);
default: default:
break; break;

6
ede-desktop/ede-desktop.h
View File

@ -15,11 +15,11 @@
#ifdef USE_EDELIB_WINDOW #ifdef USE_EDELIB_WINDOW
# include <edelib/Window.h> # include <edelib/Window.h>
# define DESKTOP_WINDOW edelib::Window # define EDE_DESKTOP_WINDOW edelib::Window
#else #else
# include <FL/Fl_Window.H> # include <FL/Fl_Window.H>
# include <FL/Fl_Double_Window.H> # include <FL/Fl_Double_Window.H>
# define DESKTOP_WINDOW Fl_Window # define EDE_DESKTOP_WINDOW Fl_Window
#endif #endif
#include <FL/Fl_Image.H> #include <FL/Fl_Image.H>
@ -88,7 +88,7 @@ typedef edelib::list<DesktopIcon*>::iterator DesktopIconListIter;
typedef edelib::list<edelib::String> StringList; typedef edelib::list<edelib::String> StringList;
typedef edelib::list<edelib::String>::iterator StringListIter; typedef edelib::list<edelib::String>::iterator StringListIter;
class Desktop : public DESKTOP_WINDOW { class Desktop : public EDE_DESKTOP_WINDOW {
private: private:
static Desktop* pinstance; static Desktop* pinstance;