diff options
author | fluxgen <fluxgen> | 2002-08-14 23:01:05 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-08-14 23:01:05 (GMT) |
commit | 9a8eee45ea211fce88ec9bf5dba2d7cfe474d8ad (patch) | |
tree | fbbb9d65625668f576d51d85e9dfa137f8ada2e5 /src | |
parent | 1f61bca0a9e969d9e634696c73768a3880c36f4d (diff) | |
download | fluxbox-9a8eee45ea211fce88ec9bf5dba2d7cfe474d8ad.zip fluxbox-9a8eee45ea211fce88ec9bf5dba2d7cfe474d8ad.tar.bz2 |
from char to std string in getRcFilename and inherit FbAtom
Diffstat (limited to 'src')
-rw-r--r-- | src/fluxbox.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index b6b5beb..e92ce48 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.hh,v 1.25 2002/08/14 00:00:16 fluxgen Exp $ | 25 | // $Id: fluxbox.hh,v 1.26 2002/08/14 23:01:05 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FLUXBOX_HH | 27 | #ifndef FLUXBOX_HH |
28 | #define FLUXBOX_HH | 28 | #define FLUXBOX_HH |
@@ -41,6 +41,7 @@ | |||
41 | #endif // SLIT | 41 | #endif // SLIT |
42 | 42 | ||
43 | #include "SignalHandler.hh" | 43 | #include "SignalHandler.hh" |
44 | #include "FbAtoms.hh" | ||
44 | 45 | ||
45 | #include <X11/Xlib.h> | 46 | #include <X11/Xlib.h> |
46 | #include <X11/Xresource.h> | 47 | #include <X11/Xresource.h> |
@@ -67,7 +68,8 @@ | |||
67 | main class for the window manager. | 68 | main class for the window manager. |
68 | singleton type | 69 | singleton type |
69 | */ | 70 | */ |
70 | class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler { | 71 | class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler, |
72 | public FbAtoms { | ||
71 | public: | 73 | public: |
72 | Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0); | 74 | Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0); |
73 | virtual ~Fluxbox(); | 75 | virtual ~Fluxbox(); |
@@ -242,8 +244,7 @@ private: | |||
242 | //default arguments for titlebar left and right | 244 | //default arguments for titlebar left and right |
243 | static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; | 245 | static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; |
244 | 246 | ||
245 | protected: | 247 | std::string getRcFilename(); |
246 | char *getRcFilename(); | ||
247 | void getDefaultDataFilename(char *, std::string &); | 248 | void getDefaultDataFilename(char *, std::string &); |
248 | void load_rc(); | 249 | void load_rc(); |
249 | 250 | ||