diff options
author | fluxgen <fluxgen> | 2002-01-27 12:45:32 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-01-27 12:45:32 (GMT) |
commit | ed2da1f1418763b3a6fe259928639d15ffe7eda2 (patch) | |
tree | eea6c18b19bbf2ff2e7109b3163adf4bba0c57ba /src/Screen.hh | |
parent | f456a2dd0bf07dd46ce4e819ce34e8641575add1 (diff) | |
download | fluxbox-ed2da1f1418763b3a6fe259928639d15ffe7eda2.zip fluxbox-ed2da1f1418763b3a6fe259928639d15ffe7eda2.tar.bz2 |
Fixed menu parsing
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index dc7aead..c91a45c 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.hh,v 1.12 2002/01/21 02:12:11 fluxgen Exp $ | 25 | // $Id: Screen.hh,v 1.13 2002/01/27 12:45:32 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef _SCREEN_HH_ | 27 | #ifndef _SCREEN_HH_ |
28 | #define _SCREEN_HH_ | 28 | #define _SCREEN_HH_ |
@@ -82,6 +82,8 @@ | |||
82 | 82 | ||
83 | #include <stdio.h> | 83 | #include <stdio.h> |
84 | #include <string> | 84 | #include <string> |
85 | #include <fstream> | ||
86 | |||
85 | 87 | ||
86 | class BScreen : public ScreenInfo { | 88 | class BScreen : public ScreenInfo { |
87 | public: | 89 | public: |
@@ -314,7 +316,7 @@ private: | |||
314 | 316 | ||
315 | 317 | ||
316 | protected: | 318 | protected: |
317 | Bool parseMenuFile(FILE *, Rootmenu *); | 319 | Bool parseMenuFile(std::ifstream &, Rootmenu *, int&); |
318 | 320 | ||
319 | bool readDatabaseTexture(char *, char *, BTexture *, unsigned long); | 321 | bool readDatabaseTexture(char *, char *, BTexture *, unsigned long); |
320 | bool readDatabaseColor(char *, char *, BColor *, unsigned long); | 322 | bool readDatabaseColor(char *, char *, BColor *, unsigned long); |