Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC6 has problems with std::vector and identifiers names 'iterator' in GDI+ headers; switch to using our own stack class instead

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-16 15:17:36 +00:00
parent 46ba1bb26d
commit bdba6fdc0d
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/msw/graphics.cpp
View File

@@ -20,29 +20,28 @@
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/msw/wrapcdlg.h" #include "wx/msw/wrapcdlg.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/dcprint.h" #include "wx/dcprint.h"
#include "wx/module.h" #include "wx/module.h"
#endif #endif
#include "wx/graphics.h" #include "wx/graphics.h"
#include <vector>
using namespace std;
#include "wx/msw/wrapgdip.h" #include "wx/msw/wrapgdip.h"
#include "wx/stack.h"
WX_DECLARE_STACK(GraphicsState, GraphicsStates);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// constants // constants
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -310,7 +309,7 @@ private:
void SetDefaults(); void SetDefaults();
Graphics* m_context; Graphics* m_context;
vector<GraphicsState> m_stateStack; GraphicsStates m_stateStack;
GraphicsState m_state1; GraphicsState m_state1;
GraphicsState m_state2; GraphicsState m_state2;
@@ -953,13 +952,13 @@ void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale )
void wxGDIPlusContext::PushState() void wxGDIPlusContext::PushState()
{ {
GraphicsState state = m_context->Save(); GraphicsState state = m_context->Save();
m_stateStack.push_back(state); m_stateStack.push(state);
} }
void wxGDIPlusContext::PopState() void wxGDIPlusContext::PopState()
{ {
GraphicsState state = m_stateStack.back(); GraphicsState state = m_stateStack.top();
m_stateStack.pop_back(); m_stateStack.pop();
m_context->Restore(state); m_context->Restore(state);
} }