nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjusted for FbTk Timer and ImageControl

Browse source
This commit is contained in:
fluxgen 2003-01-09 22:16:40 +00:00
parent 2e40e38c42
commit 20037a89be
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Window.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.hh,v 1.41 2003/01/07 01:33:18 fluxgen Exp $ // $Id: Window.hh,v 1.42 2003/01/09 22:16:40 fluxgen Exp $
#ifndef WINDOW_HH #ifndef WINDOW_HH
#define WINDOW_HH #define WINDOW_HH
@ -53,10 +53,11 @@ class BScreen;
namespace FbTk { namespace FbTk {
class MenuTheme; class MenuTheme;
class ImageControl;
}; };
/// Creates the window frame and handles any window event for it /// Creates the window frame and handles any window event for it
class FluxboxWindow : public TimeoutHandler, public FbTk::EventHandler { class FluxboxWindow : public FbTk::TimeoutHandler, public FbTk::EventHandler {
public: public:
/// layer bits /// layer bits
enum WinLayer { enum WinLayer {
@ -102,7 +103,7 @@ public:
}; };
/// create fluxbox window with parent win and screen connection /// create fluxbox window with parent win and screen connection
FluxboxWindow(Window win, BScreen *scr, int screen_num, BImageControl &imgctrl, FbWinFrameTheme &tm, FluxboxWindow(Window win, BScreen *scr, int screen_num, FbTk::ImageControl &imgctrl, FbWinFrameTheme &tm,
FbTk::MenuTheme &menutheme); FbTk::MenuTheme &menutheme);
virtual ~FluxboxWindow(); virtual ~FluxboxWindow();
@ -313,8 +314,6 @@ private:
// state and hint signals // state and hint signals
WinSubject m_hintsig, m_statesig, m_workspacesig, m_diesig; WinSubject m_hintsig, m_statesig, m_workspacesig, m_diesig;
// BImageControl &image_ctrl; /// image control for rendering
std::string m_instance_name; /// instance name from WM_CLASS std::string m_instance_name; /// instance name from WM_CLASS
std::string m_class_name; /// class name from WM_CLASS std::string m_class_name; /// class name from WM_CLASS
@ -323,7 +322,7 @@ private:
focused, stuck, modal, send_focus_message, m_managed; focused, stuck, modal, send_focus_message, m_managed;
BScreen *screen; /// screen on which this window exist BScreen *screen; /// screen on which this window exist
BTimer timer; FbTk::Timer timer;
Display *display; /// display connection (obsolete by FbTk) Display *display; /// display connection (obsolete by FbTk)
BaseDisplay::BlackboxAttributes blackbox_attrib; BaseDisplay::BlackboxAttributes blackbox_attrib;