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

changed m_windowmenu to FbTk Menu ptr instead of FbMenu and we create it via MenuCreator

Browse source
This commit is contained in:
fluxgen 2004-05-02 21:06:27 +00:00
parent d4bfeb6460
commit 1f88db4fd6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Window.hh
View file

@ -22,12 +22,11 @@
// 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.112 2004/04/18 21:17:36 fluxgen Exp $ // $Id: Window.hh,v 1.113 2004/05/02 21:06:27 fluxgen Exp $
#ifndef WINDOW_HH #ifndef WINDOW_HH
#define WINDOW_HH #define WINDOW_HH
#include "FbMenu.hh"
#include "Timer.hh" #include "Timer.hh"
#include "Subject.hh" #include "Subject.hh"
#include "EventHandler.hh" #include "EventHandler.hh"
@ -52,6 +51,7 @@ class TextButton;
class MenuTheme; class MenuTheme;
class ImageControl; class ImageControl;
class XLayer; class XLayer;
class Menu;
} }
/// Creates the window frame and handles any window event for it /// Creates the window frame and handles any window event for it
@ -152,6 +152,8 @@ public:
} BlackboxAttributes; } BlackboxAttributes;
typedef std::list<WinClient *> ClientList; typedef std::list<WinClient *> ClientList;
// this should perhaps be a refcount??
typedef std::list<std::pair<const char *, FbTk::Menu *> > ExtraMenus;
/// create a window from a client /// create a window from a client
FluxboxWindow(WinClient &client, FluxboxWindow(WinClient &client,
@ -298,11 +300,9 @@ public:
FbTk::FbWindow &fbWindow(); FbTk::FbWindow &fbWindow();
const FbTk::FbWindow &fbWindow() const; const FbTk::FbWindow &fbWindow() const;
FbTk::Menu &menu() { return m_windowmenu; } FbTk::Menu &menu() { return *m_windowmenu.get(); }
const FbTk::Menu &menu() const { return m_windowmenu; } const FbTk::Menu &menu() const { return *m_windowmenu.get(); }
// this should perhaps be a refcount??
typedef std::list<std::pair<const char *, FbTk::Menu *> > ExtraMenus;
// for extras to add menus. // for extras to add menus.
// These menus will be marked internal, // These menus will be marked internal,
@ -451,7 +451,7 @@ private:
Display *display; /// display connection Display *display; /// display connection
BlackboxAttributes m_blackbox_attrib; BlackboxAttributes m_blackbox_attrib;
FbMenu m_windowmenu; std::auto_ptr<FbTk::Menu> m_windowmenu;
timeval m_last_focus_time; timeval m_last_focus_time;