Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3870/include/graphics
Modified Files:
tc3DWindow.h
Added Files:
tcBriefingView.h
Log Message:
Updates for wxWidgets 2.6.1 compatibility
Index: tc3DWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DWindow.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tc3DWindow.h 16 Jul 2005 23:10:59 -0000 1.17
--- tc3DWindow.h 14 Sep 2005 01:33:24 -0000 1.18
***************
*** 30,33 ****
--- 30,34 ----
#include "wx/wx.h"
#endif
+ #include <wx/event.h>
#include <queue>
***************
*** 269,272 ****
--- 270,274 ----
virtual void OnMouseWheel(wxMouseEvent& event);
virtual void OnMove(wxMoveEvent& event);
+ void OnNcPaint(wxNcPaintEvent& event);
void OnPaint(wxPaintEvent& event);
virtual void OnRButtonDown(wxMouseEvent& event);
--- NEW FILE: tcBriefingView.h ---
/**
** @file tcBriefingView.h
*/
/* Copyright (C) 2005 Dewitt Colclough (de...@tw...)
** All rights reserved.
** This file is part of the Global Conflict Blue (GCB) program.
** GCB is free software; you can redistribute it and/or modify
** it under the terms of version 2 of the GNU General Public License as
** published by the Free Software Foundation.
** GCB is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
** You should have received a copy of the GNU General Public License
** along with GCB; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _BRIEFINGVIEW_H_
#define _BRIEFINGVIEW_H_
#if _MSC_VER > 1000
#pragma once
#endif
#include "wx/wx.h"
#include "tcXmlWindow.h"
/**
* Window to display simple briefing text
*/
class tcBriefingView : public tcXmlWindow
{
public:
void Draw();
tcBriefingView(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
const wxString& name = "BriefingView");
virtual ~tcBriefingView();
private:
DECLARE_EVENT_TABLE()
};
#endif
|
