fixed gcc4.1 problems, patch from Andreas Bierfert <andreas dot bierfert at lowlatency dot de>

This commit is contained in:
mathias 2006-03-02 07:49:13 +00:00
parent e742a830ad
commit a21d42da37
10 changed files with 28 additions and 8 deletions

View file

@ -1,6 +1,10 @@
(Format: Year/Month/Day)
Changes for 0.9.15:
*06/01/03:
*06/03/02:
* closed bug #1409775, gcc4.1 problems (thanx to Andreas Bierfert)
Slit.cc MenuTheme.cc Resources.cc ClockTool.cc FocusControl.cc
ScreenPlacement.cc ScreenResources.cc Toolbar.cc IconbarTool.cc
*06/03/01:
* corrections for translation files (thanx php-coder)
*06/02/27:
* minor cosmetic issues (thanx php-coder)
@ -11,7 +15,6 @@ Changes for 0.9.15:
* Moved resource helper class Layer out from
class Fluxbox. Reduced some dependencies.
(Henrik)
*06/02/19:
* Added new resize mode: Center
This mode will move all corners at the same time with

View file

@ -50,7 +50,7 @@
class ClockMenuItem: public FbTk::MenuItem {
public:
explicit ClockMenuItem::ClockMenuItem(ClockTool &tool):
explicit ClockMenuItem(ClockTool &tool):
FbTk::MenuItem(""), m_tool(tool) {
// determine 12/24 hour format
_FB_USES_NLS;

View file

@ -636,6 +636,8 @@ void FocusControl::setFocusedWindow(WinClient *client) {
}
////////////////////// FocusControl RESOURCES
namespace FbTk {
template<>
std::string FbTk::Resource<FocusControl::FocusModel>::getString() const {
switch (m_value) {
@ -682,4 +684,4 @@ setFromString(char const *strval) {
else
setDefaultValue();
}
} // end namespace FbTk

View file

@ -51,6 +51,8 @@
#include <iterator>
using namespace std;
namespace FbTk {
template<>
void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) {
if (strcasecmp(strval, "None") == 0)
@ -192,6 +194,7 @@ string FbTk::Resource<IconbarTool::Mode>::getString() const {
// default string
return string("Icons");
}
} // end namespace FbTk
namespace {

View file

@ -26,6 +26,8 @@
#include <iostream>
using namespace std;
namespace FbTk {
template <>
void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string *name, const std::string *altname) { }
@ -49,7 +51,7 @@ void FbTk::ThemeItem<Shape::ShapePlace>::setFromString(const char *str) {
*(*this) = static_cast<Shape::ShapePlace>(places);
}
} // end namespace FbTk
MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num),
m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") {
*m_shapeplace = Shape::NONE;

View file

@ -39,6 +39,7 @@ using namespace FbTk;
//-----------------------------------------------------------------
//---- accessors for int, bool, and some enums with Resource ------
//-----------------------------------------------------------------
namespace FbTk {
template<>
void FbTk::Resource<int>::
@ -254,3 +255,4 @@ getString() const {
sprintf(tmpstr, "%ld", m_value);
return string(tmpstr);
}
} // end namespace FbTk

View file

@ -129,6 +129,8 @@ bool ScreenPlacement::placeWindow(const std::vector<FluxboxWindow *> &windowlist
////////////////////// Placement Resources
namespace FbTk {
template <>
void FbTk::Resource<ScreenPlacement::PlacementPolicy>::setFromString(const char *str) {
if (strcasecmp("RowSmartPlacement", str) == 0)
@ -205,3 +207,4 @@ std::string FbTk::Resource<ScreenPlacement::ColumnDirection>::getString() const
return "TopToBottom";
}
} // end namespace FbTk

View file

@ -29,6 +29,7 @@
#include <string>
using namespace std;
namespace FbTk {
template <>
string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() const {
@ -199,4 +200,4 @@ void FbTk::Resource<FbTk::GContext::CapStyle>
else
setDefaultValue();
}
} // end namespace FbTk

View file

@ -85,6 +85,8 @@
#include <algorithm>
using namespace std;
namespace FbTk {
template<>
void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
if (strcasecmp(strval, "TopLeft")==0)
@ -164,7 +166,7 @@ string FbTk::Resource<Slit::Direction>::getString() const {
// default string
return string("Vertical");
}
} // end namespace FbTk
namespace {
class SlitClientMenuItem: public FbTk::MenuItem{

View file

@ -78,6 +78,8 @@
using namespace std;
namespace FbTk {
template<>
void FbTk::Resource<Toolbar::Placement>::
setFromString(const char *strval) {
@ -153,7 +155,7 @@ getString() const {
//default string
return string("BottomCenter");
}
} // end namespace FbTk
namespace {
class SetToolbarPlacementCmd: public FbTk::Command {