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

from char to std string in getRcFilename and inherit FbAtom

Browse source
This commit is contained in:
fluxgen 2002-08-14 23:01:05 +00:00
parent 1f61bca0a9
commit 9a8eee45ea
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/fluxbox.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.hh,v 1.25 2002/08/14 00:00:16 fluxgen Exp $
// $Id: fluxbox.hh,v 1.26 2002/08/14 23:01:05 fluxgen Exp $
#ifndef FLUXBOX_HH
#define FLUXBOX_HH
@ -41,6 +41,7 @@
#endif // SLIT
#include "SignalHandler.hh"
#include "FbAtoms.hh"
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@ -67,7 +68,8 @@
main class for the window manager.
singleton type
*/
class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler {
class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler,
public FbAtoms {
public:
Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0);
virtual ~Fluxbox();
@ -242,8 +244,7 @@ private:
//default arguments for titlebar left and right
static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[];
protected:
char *getRcFilename();
std::string getRcFilename();
void getDefaultDataFilename(char *, std::string &);
void load_rc();