aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Theme.cc')
-rw-r--r--src/Theme.cc26
1 files changed, 7 insertions, 19 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index d712f86..9c379e5 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -41,7 +41,7 @@
41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
42// DEALINGS IN THE SOFTWARE. 42// DEALINGS IN THE SOFTWARE.
43 43
44// $Id: Theme.cc,v 1.18 2002/03/21 10:54:29 fluxgen Exp $ 44// $Id: Theme.cc,v 1.19 2002/04/04 11:28:19 fluxgen Exp $
45 45
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE
47#define _GNU_SOURCE 47#define _GNU_SOURCE
@@ -889,11 +889,7 @@ void Theme::readDatabaseFontSet(char *rname, char *rclass, XFontSet *fontset) {
889 fprintf(stderr, 889 fprintf(stderr,
890 I18n::instance()-> 890 I18n::instance()->
891 getMessage( 891 getMessage(
892 #ifdef NLS 892 FBNLS::ScreenSet, FBNLS::ScreenDefaultFontLoadFail,
893 ScreenSet, ScreenDefaultFontLoadFail,
894 #else // !NLS
895 0, 0,
896 #endif // NLS
897 "BScreen::LoadStyle(): couldn't load default font.\n")); 893 "BScreen::LoadStyle(): couldn't load default font.\n"));
898 throw 2; 894 throw 2;
899 } 895 }
@@ -922,12 +918,8 @@ void Theme::readDatabaseFont(char *rname, char *rclass, XFontStruct **font) {
922 fprintf(stderr, 918 fprintf(stderr,
923 I18n::instance()-> 919 I18n::instance()->
924 getMessage( 920 getMessage(
925 #ifdef NLS 921 FBNLS::ScreenSet, FBNLS::ScreenFontLoadFail,
926 ScreenSet, ScreenFontLoadFail, 922 "BScreen::LoadStyle(): couldn't load font '%s'\n"),
927 #else // !NLS
928 0, 0,
929 #endif // NLS
930 "BScreen::LoadStyle(): couldn't load font '%s'\n"),
931 value.addr); 923 value.addr);
932 924
933 load_default = true; 925 load_default = true;
@@ -941,13 +933,9 @@ void Theme::readDatabaseFont(char *rname, char *rclass, XFontStruct **font) {
941 fprintf(stderr, 933 fprintf(stderr,
942 I18n::instance()-> 934 I18n::instance()->
943 getMessage( 935 getMessage(
944#ifdef NLS 936 FBNLS::ScreenSet, FBNLS::ScreenDefaultFontLoadFail,
945 ScreenSet, ScreenDefaultFontLoadFail, 937 "BScreen::LoadStyle(): couldn't load default font.\n"));
946#else // !NLS 938 throw 2; //fatal!
947 0, 0,
948#endif // NLS
949 "BScreen::LoadStyle(): couldn't load default font.\n"));
950 throw (int)(2);
951 } 939 }
952 } 940 }
953} 941}