From e17c54e3f80458c0c85133e877371a55f460e3e7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 13 Apr 2002 22:42:31 +0000 Subject: removed all Xrm database calls from Screen.cc (style loading). This completes the conversion to using the obResource class, there are no class to Xrm* except in Resource.cc/h --- src/Screen.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Screen.h') diff --git a/src/Screen.h b/src/Screen.h index 851c45dd..13e58a2b 100644 --- a/src/Screen.h +++ b/src/Screen.h @@ -51,8 +51,7 @@ # include "Slit.h" #endif // SLIT #include "Image.h" - -#include +#include "Resource.h" // forward declaration class BScreen; @@ -136,7 +135,7 @@ private: auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max, focus_new, focus_last; BColor border_color; - XrmDatabase stylerc; + obResource styleconfig; int workspaces, toolbar_placement, toolbar_width_percent, placement_policy, edge_snap_threshold, row_direction, col_direction; @@ -163,12 +162,13 @@ private: protected: Bool parseMenuFile(FILE *, Rootmenu *); - void readDatabaseTexture(char *, char *, BTexture *, unsigned long); - void readDatabaseColor(char *, char *, BColor *, unsigned long); + void readDatabaseTexture(const char *, const char *, BTexture *, + unsigned long); + void readDatabaseColor(const char *, const char *, BColor *, unsigned long); - void readDatabaseFontSet(char *, char *, XFontSet *); - XFontSet createFontSet(char *); - void readDatabaseFont(char *, char *, XFontStruct **); + void readDatabaseFontSet(const char *, const char *, XFontSet *); + XFontSet createFontSet(const char *); + void readDatabaseFont(const char *, const char *, XFontStruct **); void InitMenu(void); void LoadStyle(void); -- cgit v1.2.3