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

function name change, minor cleaning

Browse source
This commit is contained in:
fluxgen 2002-10-29 16:08:42 +00:00
parent 5ebc789e88
commit 495530c421
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Toolbar.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: Toolbar.hh,v 1.11 2002/08/04 15:55:13 fluxgen Exp $ // $Id: Toolbar.hh,v 1.12 2002/10/29 16:08:42 fluxgen Exp $
#ifndef TOOLBAR_HH #ifndef TOOLBAR_HH
#define TOOLBAR_HH #define TOOLBAR_HH
@ -129,12 +129,12 @@ public:
*/ */
inline Window getWindowID() const { return frame.window; } inline Window getWindowID() const { return frame.window; }
inline unsigned int getWidth() const { return frame.width; } inline unsigned int width() const { return frame.width; }
inline unsigned int getHeight() const { return frame.height; } inline unsigned int height() const { return frame.height; }
inline unsigned int getExposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); } inline unsigned int getExposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); }
inline int getX() const { return ((hidden) ? frame.x_hidden : frame.x); } inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); }
inline int getY() const { return ((hidden) ? frame.y_hidden : frame.y); } inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); }
inline IconBar *getIconBar() { return iconbar; } inline const IconBar *iconBar() const { return iconbar; }
/** /**
@name eventhandlers @name eventhandlers
*/ */
@ -188,17 +188,16 @@ private:
public: public:
Toolbar *toolbar; Toolbar *toolbar;
virtual void timeout(void); virtual void timeout();
} hide_handler; } hide_handler;
Fluxbox *fluxbox; ///< obsolete BScreen *screen;
BScreen *screen; ///< screen on wich this toolbar exist
BImageControl *image_ctrl; BImageControl *image_ctrl;
BTimer clock_timer, *hide_timer; BTimer clock_timer, hide_timer;
Toolbarmenu *toolbarmenu; Toolbarmenu *toolbarmenu;
IconBar *iconbar; IconBar *iconbar;
std::string new_workspace_name; ///< temp variable in edit mode std::string new_workspace_name; ///< temp variable in edit workspace name mode
friend class HideHandler; friend class HideHandler;
friend class Toolbarmenu; friend class Toolbarmenu;