diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/box.cpp | 5 | ||||
| -rw-r--r-- | src/gui/box.h | 42 | ||||
| -rw-r--r-- | src/gui/char_server.h | 2 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 5 |
4 files changed, 28 insertions, 26 deletions
diff --git a/src/gui/box.cpp b/src/gui/box.cpp index 183eabc3..6af3ae3e 100644 --- a/src/gui/box.cpp +++ b/src/gui/box.cpp @@ -23,9 +23,8 @@ #include "box.h" -Box::Box() - : padding(0), - gcn::Container() +Box::Box(): + padding(0) { setOpaque(false); } diff --git a/src/gui/box.h b/src/gui/box.h index fc6b91ae..d65a6ac3 100644 --- a/src/gui/box.h +++ b/src/gui/box.h @@ -29,27 +29,27 @@ class Box : public gcn::Container { - protected: - Box(); - virtual ~Box(); - - /* - * Spacing between client widgets - */ - unsigned int padding; - - virtual void draw(gcn::Graphics *) = 0; - - public: - /* - * Returns padding - */ - unsigned int getPadding(); - - /* - * Sets padding between widgets - */ - void setPadding(unsigned int); + protected: + Box(); + virtual ~Box(); + + /* + * Spacing between client widgets + */ + unsigned int padding; + + virtual void draw(gcn::Graphics *) = 0; + + public: + /* + * Returns padding + */ + unsigned int getPadding(); + + /* + * Sets padding between widgets + */ + void setPadding(unsigned int); }; #endif diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 42627b9c..bd41a479 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -32,6 +32,8 @@ */ class ServerListModel : public gcn::ListModel { public: + virtual ~ServerListModel() {}; + int getNumberOfElements(); std::string getElementAt(int i); }; diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 7ee84016..75f94b4b 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -282,8 +282,9 @@ void updateData() case UPDATE_ERROR: SDL_WaitThread(thread, NULL); new OkDialog( - "Error", ("The update process is incomplete. ", - "It is strongly recommended that you try again later"), + "Error", + "The update process is incomplete.\n" + "It is strongly recommended that you try again later", updaterWindow); logger->log("Error during the update process"); downloadStatus = UPDATE_IDLE; |