aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2007-12-30 00:36:37 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2007-12-30 00:36:37 (GMT)
commitde6d340ba3a1a64ee46e6562d0bdab062cb92a1e (patch)
treeacfe630257bc3c80a006e5c1cc19e452003dda95
parente1f362ae764884a4cd1e1673292cb37d5a85f89c (diff)
downloadfluxbox-de6d340ba3a1a64ee46e6562d0bdab062cb92a1e.zip
fluxbox-de6d340ba3a1a64ee46e6562d0bdab062cb92a1e.tar.bz2
forgotten inlines from previous round
-rw-r--r--src/FbTk/FbDrawable.hh2
-rw-r--r--src/FbTk/MenuSeparator.hh2
-rw-r--r--src/FbTk/TypeAhead.hh2
-rw-r--r--src/ToolbarItem.hh6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh
index 32f5c53..828295d 100644
--- a/src/FbTk/FbDrawable.hh
+++ b/src/FbTk/FbDrawable.hh
@@ -73,7 +73,7 @@ public:
73 virtual unsigned int width() const = 0; 73 virtual unsigned int width() const = 0;
74 virtual unsigned int height() const = 0; 74 virtual unsigned int height() const = 0;
75 virtual unsigned int depth() const = 0; 75 virtual unsigned int depth() const = 0;
76 static inline Display *display() { return s_display; } 76 static Display *display() { return s_display; }
77protected: 77protected:
78 static Display *s_display; // display connection // display connection 78 static Display *s_display; // display connection // display connection
79}; 79};
diff --git a/src/FbTk/MenuSeparator.hh b/src/FbTk/MenuSeparator.hh
index 38f15d3..3334f5e 100644
--- a/src/FbTk/MenuSeparator.hh
+++ b/src/FbTk/MenuSeparator.hh
@@ -36,7 +36,7 @@ public:
36 bool highlight, bool draw_foreground, bool draw_background, 36 bool highlight, bool draw_foreground, bool draw_background,
37 int x, int y, 37 int x, int y,
38 unsigned int width, unsigned int height) const; 38 unsigned int width, unsigned int height) const;
39 virtual inline bool isEnabled() const { return false; } 39 virtual bool isEnabled() const { return false; }
40 40
41}; 41};
42 42
diff --git a/src/FbTk/TypeAhead.hh b/src/FbTk/TypeAhead.hh
index 3b7c077..838a454 100644
--- a/src/FbTk/TypeAhead.hh
+++ b/src/FbTk/TypeAhead.hh
@@ -32,7 +32,7 @@ template <typename Items, typename Item_Type>
32class TypeAhead { 32class TypeAhead {
33#if 0 33#if 0
34 34
35a class template can't be split into separate interface + implementation files, an interface summary is given here: 35// a class template can't be split into separate interface + implementation files, an interface summary is given here:
36 36
37public: 37public:
38 void init(Items const &items); 38 void init(Items const &items);
diff --git a/src/ToolbarItem.hh b/src/ToolbarItem.hh
index 5e1ed25..5f8797d 100644
--- a/src/ToolbarItem.hh
+++ b/src/ToolbarItem.hh
@@ -32,7 +32,7 @@
32class ToolbarItem { 32class ToolbarItem {
33public: 33public:
34 /// size type in the toolbar 34 /// size type in the toolbar
35 enum Type { 35 enum Type {
36 FIXED, ///< the size can not be changed 36 FIXED, ///< the size can not be changed
37 RELATIVE, ///< the size can be changed 37 RELATIVE, ///< the size can be changed
38 SQUARE ///< the size is fixed relative to the parent, and in both dimensions 38 SQUARE ///< the size is fixed relative to the parent, and in both dimensions
@@ -54,7 +54,7 @@ public:
54 // some items might be there, but effectively empty, so shouldn't appear 54 // some items might be there, but effectively empty, so shouldn't appear
55 virtual bool active() { return true; } 55 virtual bool active() { return true; }
56 56
57 // Tools should NOT listen to theme changes - they'll get notified by 57 // Tools should NOT listen to theme changes - they'll get notified by
58 // the toolbar instead. Otherwise there are ordering problems. 58 // the toolbar instead. Otherwise there are ordering problems.
59 virtual void renderTheme(unsigned char alpha) = 0; 59 virtual void renderTheme(unsigned char alpha) = 0;
60 60
@@ -69,7 +69,7 @@ public:
69 void setType(Type type) { m_type = type; } 69 void setType(Type type) { m_type = type; }
70 Type type() const { return m_type; } 70 Type type() const { return m_type; }
71 71
72 inline FbTk::Orientation orientation() const { return m_orientation; } 72 FbTk::Orientation orientation() const { return m_orientation; }
73 virtual void setOrientation(FbTk::Orientation orient) { m_orientation = orient; } 73 virtual void setOrientation(FbTk::Orientation orient) { m_orientation = orient; }
74 74
75 class ToolbarItemSubject : public FbTk::Subject {}; 75 class ToolbarItemSubject : public FbTk::Subject {};