4b2828bd8b
- Run spec-cleaner
- Update to 3.4:
* Added LanguageManager::getLanguages
* Fix lost key focus event not being triggered sometimes
* Fix inconsistency: _riseMouseButtonMove was using Layer
coordinates (most of the time).
_riseMouseButtonReleased/Pressed were using absolute coordinates.
* Other InputManager events fixes.
* Minor MacOS build fixes.
* Cleaner and much faster logic for adding and removing
render items (it was the performance bottleneck when
working with many items on screen).
* ScrollBar: Fixed wrong tracking area bug.
* Button: make Button with key focus (can be set only
manually through code) have highlighted state.
* ItemBox: add possibility to not update ItemBox content
when working with items (huge speed boost, when
adding/removing many in single frame)
* EditText: add support for alpha in text and text
shadow colours (multiplied with widget's alpha).
* ItemBox: add options to hide ItemBox scroll bars
(same as for ScrollView and EditBox).
* MultiListBox: slightly advanced and more flexible
custom compare function.
* EditBox: add Ctrl+Left/Right hotkey support (moves
cursor to next word).
* MultiListBox: add eventNotifyItem.
* OpenGL3Platform: Added new rendering platform.
* OpenGLESPlatform: Added new rendering platform.
* Emscripten support (works for Ogre and all OpenGL
OBS-URL: https://build.opensuse.org/request/show/789453
OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=22
20 lines
545 B
Diff
20 lines
545 B
Diff
diff --git a/MyGUIEngine/include/MyGUI_Singleton.h b/MyGUIEngine/include/MyGUI_Singleton.h
|
|
index 5067da9..e12287d 100644
|
|
--- a/MyGUIEngine/include/MyGUI_Singleton.h
|
|
+++ b/MyGUIEngine/include/MyGUI_Singleton.h
|
|
@@ -58,8 +58,14 @@ namespace MyGUI
|
|
}
|
|
|
|
private:
|
|
+#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC || MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
|
|
static T* msInstance;
|
|
static const char* mClassTypeName;
|
|
+#else
|
|
+ static MYGUI_EXPORT T* msInstance;
|
|
+
|
|
+ static MYGUI_EXPORT const char* mClassTypeName;
|
|
+#endif
|
|
};
|
|
|
|
} // namespace MyGUI
|