Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/ui/menu.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/ui/menu.h')
-rw-r--r--src/ui/menu.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/menu.h b/src/ui/menu.h
index c907d76..7fd211c 100644
--- a/src/ui/menu.h
+++ b/src/ui/menu.h
@@ -24,18 +24,18 @@ public:
/// create a new menu
Menu(Window *parent, const char * label = 0);
~Menu();
-
+
/// set the background bitmap
void set_background_texture(const char *texture);
/// set the background bitmap
void set_background_texture(const std::string &texture);
-
+
/// add a label
- Label *add_label(char const * text=0);
-
+ Label *add_label(char const * text = 0);
+
/// add a button with a command
- Button *add_button(char const *text=0, char const *command=0);
+ Button *add_button(char const *text = 0, char const *command = 0);
protected:
/// resize event
@@ -43,10 +43,10 @@ protected:
/// keypress event
virtual bool on_keypress(const int key, const unsigned int modifier);
-
+
private:
Bitmap *menu_background;
- Container *menu_container;
+ Container *menu_container;
};
}