From 009eec38c8ff5d107f9d42be1d142d6d01fd2c28 Mon Sep 17 00:00:00 2001 From: pouillot Date: Tue, 3 Aug 2010 19:16:11 +0000 Subject: [PATCH] Windows port for "Enhanced GfuiMenuScreenClass to wrap most of the guimenu API" git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2596 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 862080585160fc2b6466ae6ea54bd0c76f6ff979 Former-commit-id: 7c47c7d6884fe01dec7738553c6338d6d4037ba9 --- src/libs/tgfclient/guimenu.cpp | 3 +++ src/libs/tgfclient/tgfclient.h | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libs/tgfclient/guimenu.cpp b/src/libs/tgfclient/guimenu.cpp index 8ed1e5a1..2f5a8578 100644 --- a/src/libs/tgfclient/guimenu.cpp +++ b/src/libs/tgfclient/guimenu.cpp @@ -990,6 +990,7 @@ void* GfuiMenuScreen::GetPreviousMenuHandle() const bool GfuiMenuScreen::OpenXMLDescriptor() { m_priv->xmlDescParmHdle = LoadMenuXML(m_priv->strXMLDescFileName.c_str()); + return m_priv->xmlDescParmHdle != 0; } bool GfuiMenuScreen::CloseXMLDescriptor() @@ -998,7 +999,9 @@ bool GfuiMenuScreen::CloseXMLDescriptor() { GfParmReleaseHandle(m_priv->xmlDescParmHdle); m_priv->xmlDescParmHdle = 0; + return true; } + return false; } bool GfuiMenuScreen::CreateStaticControls() diff --git a/src/libs/tgfclient/tgfclient.h b/src/libs/tgfclient/tgfclient.h index 6a13ceb7..94157f14 100644 --- a/src/libs/tgfclient/tgfclient.h +++ b/src/libs/tgfclient/tgfclient.h @@ -240,11 +240,6 @@ TGFCLIENT_API void GfuiInitWindowPosition(int x, int y); TGFCLIENT_API void GfuiInitWindowSize(int x, int y); TGFCLIENT_API void GfuiSwapBuffers(void); -// Export STL needed container types (needed with MSVC compilers). -#ifdef WIN32 -ExportSTLVector(TGFCLIENT_API, std::string); -#endif - class TGFCLIENT_API GfuiMenuScreen { public: