summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp2
-rw-r--r--src/gui/widgets/basiccontainer.cpp1
-rw-r--r--src/gui/widgets/basiccontainer2.cpp2
-rw-r--r--src/gui/widgets/browserbox.cpp1
-rw-r--r--src/gui/widgets/button.cpp1
-rw-r--r--src/gui/widgets/checkbox.cpp2
-rw-r--r--src/gui/widgets/colorpage.cpp2
-rw-r--r--src/gui/widgets/desktop.cpp2
-rw-r--r--src/gui/widgets/dropdown.cpp2
-rw-r--r--src/gui/widgets/emotepage.cpp1
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp1
-rw-r--r--src/gui/widgets/extendedlistbox.cpp2
-rw-r--r--src/gui/widgets/guitable.cpp1
-rw-r--r--src/gui/widgets/icon.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.cpp3
-rw-r--r--src/gui/widgets/itemshortcutcontainer.cpp1
-rw-r--r--src/gui/widgets/label.cpp2
-rw-r--r--src/gui/widgets/listbox.cpp1
-rw-r--r--src/gui/widgets/passwordfield.cpp2
-rw-r--r--src/gui/widgets/playerbox.cpp2
-rw-r--r--src/gui/widgets/popup.cpp1
-rw-r--r--src/gui/widgets/progressbar.cpp1
-rw-r--r--src/gui/widgets/progressindicator.cpp1
-rw-r--r--src/gui/widgets/radiobutton.cpp2
-rw-r--r--src/gui/widgets/scrollarea.cpp1
-rw-r--r--src/gui/widgets/shoplistbox.cpp2
-rw-r--r--src/gui/widgets/slider.cpp1
-rw-r--r--src/gui/widgets/sliderlist.cpp2
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/staticbrowserbox.cpp1
-rw-r--r--src/gui/widgets/tabbedarea.cpp1
-rw-r--r--src/gui/widgets/tabs/chat/chattab.cpp15
-rw-r--r--src/gui/widgets/tabs/chat/chattab.h22
-rw-r--r--src/gui/widgets/tabs/mapdebugtab.cpp1
-rw-r--r--src/gui/widgets/tabs/netdebugtab.cpp1
-rw-r--r--src/gui/widgets/tabs/setup_misc.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp14
-rw-r--r--src/gui/widgets/tabs/setup_visual.cpp8
-rw-r--r--src/gui/widgets/tabs/socialplayerstab.h1
-rw-r--r--src/gui/widgets/tabs/statdebugtab.cpp1
-rw-r--r--src/gui/widgets/tabs/tab.cpp1
-rw-r--r--src/gui/widgets/tabs/targetdebugtab.cpp1
-rw-r--r--src/gui/widgets/textbox.cpp2
-rw-r--r--src/gui/widgets/textfield.cpp1
-rw-r--r--src/gui/widgets/textpreview.cpp2
-rw-r--r--src/gui/widgets/virtshortcutcontainer.cpp1
-rw-r--r--src/gui/widgets/window.cpp1
-rw-r--r--src/gui/widgets/windowcontainer.cpp1
48 files changed, 101 insertions, 24 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index c3c1dfd7f..95890c36b 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -48,6 +48,8 @@
#include "resources/map/map.h"
+#include "utils/performance.h"
+
#include "debug.h"
int AvatarListBox::instances = 0;
diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index a3e140d5f..ec4c5c2d6 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -66,6 +66,7 @@
#include "utils/checkutils.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "render/graphics.h"
diff --git a/src/gui/widgets/basiccontainer2.cpp b/src/gui/widgets/basiccontainer2.cpp
index 63c98b42a..ab1457744 100644
--- a/src/gui/widgets/basiccontainer2.cpp
+++ b/src/gui/widgets/basiccontainer2.cpp
@@ -70,6 +70,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include "debug.h"
BasicContainer2::BasicContainer2(const Widget2 *const widget) :
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 8503bda75..9b402bb89 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -47,6 +47,7 @@
#include "utils/browserboxtools.h"
#include "utils/checkutils.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "utils/timer.h"
#include "utils/translation/podict.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 7642a122f..62d615dc9 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -83,6 +83,7 @@
#include "render/vertexes/imagecollection.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index ce5ac28b0..d1bee3665 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -79,6 +79,8 @@
#include "resources/image/image.h"
+#include "utils/performance.h"
+
#include "debug.h"
int CheckBox::instances = 0;
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 5ed2fb8a0..dfa8b8258 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -29,6 +29,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include "debug.h"
ColorPage::ColorPage(const Widget2 *const widget,
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 4d21c9983..c68b3bea2 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -44,6 +44,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include "debug.h"
Desktop *desktop = nullptr;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index e66bdafbe..48433320a 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -39,6 +39,8 @@
#include "resources/imagerect.h"
+#include "utils/performance.h"
+
#include "debug.h"
int DropDown::instances = 0;
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 33cc1cdc3..ea461356f 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -31,6 +31,7 @@
#include "utils/delete2.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 789a3bed5..c086c828a 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -45,6 +45,7 @@
#include "resources/sprite/animatedsprite.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 20c13e519..6f6c01fce 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -29,6 +29,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include "debug.h"
ExtendedListBox::ExtendedListBox(const Widget2 *const widget,
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index d3aff69f7..47e00ccc1 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -35,6 +35,7 @@
#include "utils/delete2.h"
#include "utils/dtor.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index f5430a69c..5fd16af1b 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -31,6 +31,8 @@
#include "resources/loaders/imageloader.h"
+#include "utils/performance.h"
+
#include "debug.h"
Icon::Icon(const Widget2 *const widget,
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 3b8f349e4..0e1bfda59 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -57,6 +57,7 @@
#include "utils/delete2.h"
#include "utils/foreach.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "render/vertexes/imagecollection.h"
@@ -863,7 +864,7 @@ void ItemContainer::mouseReleased(MouseEvent &event)
if (index == mSelectedIndex || mSelectedIndex == -1)
return;
if (inventoryWindow != nullptr)
- inventoryWindow->combineItems(index, mSelectedIndex);
+ inventoryWindow->combineItems(mSelectedIndex, index);
return;
}
else if (src == DragDropSource::Cart &&
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 774cb92e6..888cb7e61 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -51,6 +51,7 @@
#include "const/resources/skill.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 9ab506ac0..4e10d8819 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -70,6 +70,8 @@
#include "gui/fonts/font.h"
+#include "utils/performance.h"
+
#include "debug.h"
Skin *Label::mSkin = nullptr;
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 04c02f1ca..6b08174ce 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -79,6 +79,7 @@
#include "listeners/selectionlistener.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "render/graphics.h"
diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index c24c1c41c..893a830c0 100644
--- a/src/gui/widgets/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
@@ -25,6 +25,8 @@
#include "gui/skin.h"
+#include "utils/performance.h"
+
#include "debug.h"
PasswordField::PasswordField(const Widget2 *const widget,
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index b02798a1b..75060e9be 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -34,6 +34,8 @@
#include "resources/image/image.h"
+#include "utils/performance.h"
+
#include "debug.h"
PlayerBox::PlayerBox(Widget2 *const widget,
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index c217bd0b7..2bd8f922e 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -30,6 +30,7 @@
#include "gui/widgets/windowcontainer.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "render/graphics.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 8c7afe1cc..070488bf9 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -31,6 +31,7 @@
#include "gui/fonts/font.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "render/graphics.h"
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index 8dbe2b3b1..1fa579665 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -30,6 +30,7 @@
#include "resources/animation/simpleanimation.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index d313d9035..586695665 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -79,6 +79,8 @@
#include "resources/image/image.h"
+#include "utils/performance.h"
+
#include "debug.h"
int RadioButton::instances = 0;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index e054d461d..9e3b60466 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -72,6 +72,7 @@
#include "gui/skin.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "render/graphics.h"
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 043b1b5bb..95ba47175 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -45,6 +45,8 @@
#include "resources/item/shopitem.h"
+#include "utils/performance.h"
+
#include "debug.h"
const int ITEM_ICON_SIZE = 32;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 8ff7ac5c7..674be268e 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -73,6 +73,7 @@
#include "gui/gui.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "resources/imagerect.h"
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index a1b76cd28..178996d6c 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -30,6 +30,8 @@
#include "gui/widgets/button.h"
#include "gui/widgets/label.h"
+#include "utils/performance.h"
+
#include "debug.h"
static const int buttonWidth = 27;
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 14ac43597..1e3b02796 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -39,6 +39,8 @@
#include "gui/windows/shortcutwindow.h"
+#include "utils/performance.h"
+
#include "debug.h"
SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget,
diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp
index 070cd5947..4501a4e70 100644
--- a/src/gui/widgets/staticbrowserbox.cpp
+++ b/src/gui/widgets/staticbrowserbox.cpp
@@ -47,6 +47,7 @@
#include "utils/browserboxtools.h"
#include "utils/checkutils.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "utils/stdmove.h"
#include "utils/stringutils.h"
#include "utils/translation/podict.h"
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index c56e114c1..3f053de39 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -74,6 +74,7 @@
#include "utils/delete2.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index b1847cde1..b09e57585 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -38,6 +38,7 @@
#include "gui/windows/chatwindow.h"
#include "gui/windows/helpwindow.h"
+#include "gui/widgets/browserbox.h"
#include "gui/widgets/scrollarea.h"
#include "gui/widgets/itemlinkhandler.h"
#include "gui/widgets/tabbedarea.h"
@@ -51,9 +52,9 @@
#include "utils/delete2.h"
#include "utils/gettext.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <sys/time.h>
-#endif // WIN32
+#endif // _WIN32
#include <sstream>
@@ -437,6 +438,16 @@ void ChatTab::clearText()
mTextOutput->clearRows();
}
+const std::list<std::string> &ChatTab::getRows() const
+{
+ return mTextOutput->getRows();
+}
+
+bool ChatTab::hasRows() const
+{
+ return mTextOutput->hasRows();
+}
+
void ChatTab::handleInput(const std::string &msg)
{
if (chatHandler)
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index a08429b24..3cab5f54d 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -31,12 +31,11 @@
#include "enums/simpletypes/online.h"
#include "enums/simpletypes/tryremovecolors.h"
-#include "gui/widgets/browserbox.h"
-
#include "gui/widgets/tabs/tab.h"
#include "localconsts.h"
+class BrowserBox;
class ScrollArea;
#define debugMsg(str) \
@@ -115,10 +114,23 @@ class ChatTab notfinal : public Tab
/**
* Clears the text from the tab
+ * @see BrowserBox::clearRows
*/
void clearText();
/**
+ * Returns lines of text from the widget,
+ * @see BrowserBox::getRows
+ */
+ const std::list<std::string> &getRows() const A_WARN_UNUSED;
+
+ /**
+ * true if the widget has any lines
+ * @see BrowserBox::hasRows
+ */
+ bool hasRows() const A_WARN_UNUSED;
+
+ /**
* Handle special commands. Allows a tab to handle commands it
* defines itself.
*
@@ -147,12 +159,6 @@ class ChatTab notfinal : public Tab
void saveToLogFile(const std::string &msg) const;
- const std::list<std::string> &getRows() const A_WARN_UNUSED
- { return mTextOutput->getRows(); }
-
- bool hasRows() const A_WARN_UNUSED
- { return mTextOutput->hasRows(); }
-
void loadFromLogFile(const std::string &name,
const unsigned maxLines);
diff --git a/src/gui/widgets/tabs/mapdebugtab.cpp b/src/gui/widgets/tabs/mapdebugtab.cpp
index 4084115e5..6589f1a39 100644
--- a/src/gui/widgets/tabs/mapdebugtab.cpp
+++ b/src/gui/widgets/tabs/mapdebugtab.cpp
@@ -42,6 +42,7 @@
#include "resources/map/map.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "utils/timer.h"
diff --git a/src/gui/widgets/tabs/netdebugtab.cpp b/src/gui/widgets/tabs/netdebugtab.cpp
index 3f14f1cdd..bbee16d1e 100644
--- a/src/gui/widgets/tabs/netdebugtab.cpp
+++ b/src/gui/widgets/tabs/netdebugtab.cpp
@@ -30,6 +30,7 @@
#include "net/packetcounters.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/setup_misc.cpp b/src/gui/widgets/tabs/setup_misc.cpp
index ea159e8cf..f874497b7 100644
--- a/src/gui/widgets/tabs/setup_misc.cpp
+++ b/src/gui/widgets/tabs/setup_misc.cpp
@@ -563,13 +563,13 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) :
MainConfig_true);
#endif // ANDROID
-#ifndef WIN32
+#ifndef _WIN32
// TRANSLATORS: settings option
new SetupItemTextField(_("Screenshot directory"), "",
"screenshotDirectory3", this, "screenshotDirectory3Event",
MainConfig_true,
UseBase64_true);
-#endif // WIN32
+#endif // _WIN32
// TRANSLATORS: settings option
new SetupItemIntTextField(_("Network delay between sub servers"),
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index c980280e8..662e6f356 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -239,11 +239,11 @@ void Setup_Video::apply()
* See http://libsdl.org/cgi/docwiki.cgi/SDL_SetVideoMode
*/
-#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#if defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
// checks for opengl usage
if (intToRenderType(config.getIntValue("opengl")) == RENDER_SOFTWARE)
{
-#endif // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#endif // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
if (!WindowManager::setFullScreen(fullscreen))
{
fullscreen = !fullscreen;
@@ -267,7 +267,7 @@ void Setup_Video::apply()
logger->safeError(errorMsg.str());
}
}
-#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#if defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
}
else
{
@@ -284,7 +284,7 @@ void Setup_Video::apply()
nullptr,
260);
}
-#endif // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#endif // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
config.setValue("screen", fullscreen);
}
@@ -415,7 +415,7 @@ void Setup_Video::action(const ActionEvent &event)
if (width != mainGraphics->mActualWidth
|| height != mainGraphics->mActualHeight)
{
-#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#if defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
if (intToRenderType(config.getIntValue("opengl"))
== RENDER_SOFTWARE)
{
@@ -459,11 +459,11 @@ void Setup_Video::action(const ActionEvent &event)
260);
}
}
-#else // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#else // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
mainGraphics->setWindowSize(width, height);
WindowManager::doResizeVideo(width, height, false);
-#endif // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#endif // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
}
config.setValue("oldscreen", config.getBoolValue("screen"));
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 7f0dcdae9..4ddf7ef71 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -230,12 +230,12 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
"vsyncEvent", mVSyncList, 100,
MainConfig_true);
-#if defined(WIN32) || defined(__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__)
// TRANSLATORS: settings option
new SetupItemCheckBox(_("Center game window"),
"", "centerwindow", this, "centerwindowEvent",
MainConfig_true);
-#endif // defined(WIN32) || defined(__APPLE__)
+#endif // defined(_WIN32) || defined(__APPLE__)
// TRANSLATORS: settings option
new SetupItemCheckBox(_("Allow screensaver to run"),
@@ -269,7 +269,7 @@ void Setup_Visual::apply()
{
SetupTabScroll::apply();
WindowManager::applyGrabMode();
-#ifndef WIN32
+#ifndef _WIN32
WindowManager::applyScale();
-#endif // WIN32
+#endif // _WIN32
}
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 029a24746..c3f9b4f1c 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -33,6 +33,7 @@
#include "utils/gettext.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/tabs/statdebugtab.cpp b/src/gui/widgets/tabs/statdebugtab.cpp
index 63ce8aee8..f6d741a3f 100644
--- a/src/gui/widgets/tabs/statdebugtab.cpp
+++ b/src/gui/widgets/tabs/statdebugtab.cpp
@@ -31,6 +31,7 @@
#include "gui/windows/chatwindow.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/perfstat.h"
#include "utils/stringutils.h"
#include "utils/timer.h"
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 6e750b2cb..70e348b4c 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -81,6 +81,7 @@
#include "resources/image/image.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/targetdebugtab.cpp b/src/gui/widgets/tabs/targetdebugtab.cpp
index 4c43d2b29..5db850d5d 100644
--- a/src/gui/widgets/tabs/targetdebugtab.cpp
+++ b/src/gui/widgets/tabs/targetdebugtab.cpp
@@ -28,6 +28,7 @@
#include "gui/widgets/layouthelper.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index e1f41855c..9a949a8b1 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -72,6 +72,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include <sstream>
#include "debug.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 4fd7403d2..d8e9b0268 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -85,6 +85,7 @@
#include "input/inputmanager.h"
#include "utils/copynpaste.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#ifndef USE_SDL2
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index c1fec888d..4b1187205 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -32,6 +32,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include "debug.h"
int TextPreview::instances = 0;
diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp
index a78feae65..fbc18976c 100644
--- a/src/gui/widgets/virtshortcutcontainer.cpp
+++ b/src/gui/widgets/virtshortcutcontainer.cpp
@@ -39,6 +39,7 @@
#include "gui/windows/inventorywindow.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 46bb313e0..003044fcc 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -98,6 +98,7 @@
#include "utils/checkutils.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index feb0745db..ac3bf67d6 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -28,6 +28,7 @@
#include "utils/checkutils.h"
#include "utils/dtor.h"
#include "utils/foreach.h"
+#include "utils/performance.h"
#include "debug.h"