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

fixed checking in ThemeItem int

Browse source
This commit is contained in:
fluxgen 2004-01-02 21:59:52 +00:00
parent 7c11f8b593
commit baa6a4a42f
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/FbTk/ThemeItems.hh
View file

@ -19,7 +19,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: ThemeItems.hh,v 1.3 2003/11/28 23:02:05 fluxgen Exp $ // $Id: ThemeItems.hh,v 1.4 2004/01/02 21:59:52 fluxgen Exp $
/// @file implements common theme items /// @file implements common theme items
@ -64,9 +64,13 @@ void FbTk::ThemeItem<int>::setDefaultValue() {
template <> template <>
void FbTk::ThemeItem<int>::setFromString(const char *str) { void FbTk::ThemeItem<int>::setFromString(const char *str) {
if (str == 0) if (str == 0) {
setDefaultValue();
return; return;
sscanf(str, "%d", &m_value); }
if (sscanf(str, "%d", &m_value) < 1)
setDefaultValue();
} }
template <> template <>
@ -124,16 +128,21 @@ void ThemeItem<FbTk::Texture>::load() {
StringUtil::removeFirstWhitespace(pixmap_name); StringUtil::removeFirstWhitespace(pixmap_name);
StringUtil::removeTrailingWhitespace(pixmap_name); StringUtil::removeTrailingWhitespace(pixmap_name);
if (pixmap_name.empty()) {
m_value.pixmap() = 0;
return;
}
std::auto_ptr<PixmapWithMask> pm(Image::load(pixmap_name, std::auto_ptr<PixmapWithMask> pm(Image::load(pixmap_name,
m_tm.screenNum())); m_tm.screenNum()));
if (pm.get() == 0) { if (pm.get() == 0) {
if (FbTk::ThemeManager::instance().verbose()) if (FbTk::ThemeManager::instance().verbose()) {
cerr<<"Resource("<<name()+".pixmap" cerr<<"Resource("<<name()+".pixmap"
<<"): Failed to load image: "<<pixmap_name<<endl; <<"): Failed to load image: "<<pixmap_name<<endl;
}
m_value.pixmap() = 0; m_value.pixmap() = 0;
} else } else
m_value.pixmap() = pm->pixmap().release(); m_value.pixmap() = pm->pixmap().release();
} }
template <> template <>