mirror of
https://github.com/Heretek-AI/GDevelop.git
synced 2026-07-22 01:55:25 -04:00
Adapted to changes in GDCore.
git-svn-id: svn://localhost@830 8062f311-0dae-4547-b526-b8ab9ac864a5
This commit is contained in:
@@ -24,22 +24,27 @@ freely, subject to the following restrictions:
|
||||
|
||||
*/
|
||||
|
||||
#if defined(GD_IDE_ONLY)
|
||||
#include <wx/wx.h> //Must be placed first, otherwise we get errors relative to "cannot convert 'const TCHAR*'..." in wx/msw/winundef.h
|
||||
#endif
|
||||
#include <SFML/Graphics.hpp>
|
||||
#include <string>
|
||||
#include "GDL/Object.h"
|
||||
|
||||
#include "GDL/ImageManager.h"
|
||||
#include "GDL/tinyxml/tinyxml.h"
|
||||
#include "GDL/Position.h"
|
||||
#include "GDL/RuntimeScene.h"
|
||||
#include "TextEntryObject.h"
|
||||
#if defined(GD_IDE_ONLY)
|
||||
#include "GDCore/IDE/ArbitraryResourceWorker.h"
|
||||
#include "GDL/CommonTools.h"
|
||||
#include "GDCore/IDE/Dialogs/MainFrameWrapper.h"
|
||||
#include "TextEntryObjectEditor.h"
|
||||
#endif
|
||||
|
||||
#if defined(GD_IDE_ONLY)
|
||||
#include <wx/wx.h>
|
||||
#include "GDL/CommonTools.h"
|
||||
#include "GDCore/IDE/ArbitraryResourceWorker.h"
|
||||
#include "GDL/IDE/MainEditorCommand.h"
|
||||
#include "TextEntryObjectEditor.h"
|
||||
sf::Texture TextEntryObject::edittimeIconImage;
|
||||
sf::Sprite TextEntryObject::edittimeIcon;
|
||||
#endif
|
||||
|
||||
TextEntryObject::TextEntryObject(std::string name_) :
|
||||
@@ -49,16 +54,6 @@ TextEntryObject::TextEntryObject(std::string name_) :
|
||||
{
|
||||
}
|
||||
|
||||
void TextEntryObject::LoadFromXml(const TiXmlElement * object)
|
||||
{
|
||||
}
|
||||
|
||||
#if defined(GD_IDE_ONLY)
|
||||
void TextEntryObject::SaveToXml(TiXmlElement * object)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
bool TextEntryObject::LoadRuntimeResources(const RuntimeScene & scene_, const ImageManager & imageMgr )
|
||||
{
|
||||
scene = &scene_;
|
||||
@@ -109,23 +104,28 @@ void TextEntryObject::UpdateTime(float)
|
||||
*/
|
||||
bool TextEntryObject::DrawEdittime( sf::RenderTarget& renderTarget )
|
||||
{
|
||||
edittimeIcon.SetPosition(GetX(), GetY());
|
||||
renderTarget.Draw(edittimeIcon);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void TextEntryObject::ExposeResources(gd::ArbitraryResourceWorker & worker)
|
||||
void TextEntryObject::LoadEdittimeIcon()
|
||||
{
|
||||
edittimeIconImage.LoadFromFile("Extensions/textentry.png");
|
||||
edittimeIcon.SetTexture(edittimeIconImage);
|
||||
}
|
||||
|
||||
bool TextEntryObject::GenerateThumbnail(const Game & game, wxBitmap & thumbnail)
|
||||
bool TextEntryObject::GenerateThumbnail(const gd::Project & project, wxBitmap & thumbnail)
|
||||
{
|
||||
thumbnail = wxBitmap("Extensions/textentry.png", wxBITMAP_TYPE_ANY);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void TextEntryObject::EditObject( wxWindow* parent, Game & game, MainEditorCommand & mainEditorCommand )
|
||||
void TextEntryObject::EditObject( wxWindow* parent, Game & game, gd::MainFrameWrapper & mainFrameWrapper )
|
||||
{
|
||||
/*TextEntryObjectEditor dialog(parent, game, *this, mainEditorCommand);
|
||||
/*TextEntryObjectEditor dialog(parent, game, *this, mainFrameWrapper);
|
||||
dialog.ShowModal();*/
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user