From 0b7d3f5539a14c77458ca9d6db09bb40c18e18e4 Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 9 Jun 2012 21:14:46 +0000 Subject: [PATCH] Adapted to changes in GDCore. Cleaned headers. git-svn-id: svn://localhost@762 8062f311-0dae-4547-b526-b8ab9ac864a5 --- .../PhysicsAutomatism/CustomPolygonDialog.cpp | 8 +- Extensions/PhysicsAutomatism/Extension.cpp | 3 +- .../PhysicsAutomatism/PhysicsAutomatism.cbp | 15 +- .../PhysicsAutomatism/PhysicsAutomatism.cpp | 20 +- .../PhysicsAutomatism.depend | 22609 ++-------------- .../PhysicsAutomatism/PhysicsAutomatism.h | 227 +- .../PhysicsAutomatism.layout | 135 +- .../PhysicsAutomatismEditor.cpp | 3 +- .../RuntimeScenePhysicsDatas.h | 1 - .../PhysicsAutomatism/ScenePhysicsDatas.h | 1 - .../wxsmith/CustomPolygonDialog.wxs | 3 +- 11 files changed, 3076 insertions(+), 19949 deletions(-) diff --git a/Extensions/PhysicsAutomatism/CustomPolygonDialog.cpp b/Extensions/PhysicsAutomatism/CustomPolygonDialog.cpp index 728a820957..847f0711c4 100644 --- a/Extensions/PhysicsAutomatism/CustomPolygonDialog.cpp +++ b/Extensions/PhysicsAutomatism/CustomPolygonDialog.cpp @@ -43,7 +43,7 @@ freely, subject to the following restrictions: #include #include "GDL/CommonTools.h" -#include "GDL/IDE/Dialogs/BitmapGUIManager.h" +#include "GDCore/IDE/CommonBitmapManager.h" #include #include @@ -121,7 +121,7 @@ CustomPolygonDialog::CustomPolygonDialog(wxWindow* parent, std::vectorAdd(StaticText2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Positionnement")); GridSizer1 = new wxGridSizer(3, 1, 0, 0); - OnCenterRadioBt = new wxRadioButton(this, ID_RADIOBUTTON3, _("Positionner par rapport au centre"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON3")); + OnCenterRadioBt = new wxRadioButton(this, ID_RADIOBUTTON3, _("Positionner par rapport au centre"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP, wxDefaultValidator, _T("ID_RADIOBUTTON3")); OnCenterRadioBt->SetValue(true); GridSizer1->Add(OnCenterRadioBt, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); OnOriginRadioBt = new wxRadioButton(this, ID_RADIOBUTTON1, _("Positionner par rapport à l\'origine"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON1")); @@ -291,7 +291,7 @@ void CustomPolygonDialog::OnpreviewPnlPaint(wxPaintEvent& event) float yOffset = (previewPnlVerticalScroll->GetThumbPosition() - previewPnlVerticalScroll->GetRange()/2); //Draw background - dc.SetBrush(BitmapGUIManager::GetInstance()->transparentBg); + dc.SetBrush(gd::CommonBitmapManager::GetInstance()->transparentBg); dc.DrawRectangle(0,0, panelSize.GetWidth(), panelSize.GetHeight()); //Draw Collision Polygon @@ -343,7 +343,7 @@ void CustomPolygonDialog::OnpreviewPnlPaint(wxPaintEvent& event) } //Draw origin - wxBitmap point(BitmapGUIManager::GetInstance()->point); + wxBitmap point(gd::CommonBitmapManager::GetInstance()->point); dc.DrawBitmap(point, (0-point.GetWidth()/2) -xOffset, (0-point.GetHeight()/2) -yOffset, diff --git a/Extensions/PhysicsAutomatism/Extension.cpp b/Extensions/PhysicsAutomatism/Extension.cpp index dd10e80947..aa58246d72 100644 --- a/Extensions/PhysicsAutomatism/Extension.cpp +++ b/Extensions/PhysicsAutomatism/Extension.cpp @@ -31,10 +31,11 @@ freely, subject to the following restrictions: #include "GDL/ExtensionBase.h" #include "GDL/Version.h" #include "PhysicsAutomatism.h" +#include "ScenePhysicsDatas.h" #include /** - * This class declare information about the extension. + * \brief This class declares information about the extension. */ class Extension : public ExtensionBase { diff --git a/Extensions/PhysicsAutomatism/PhysicsAutomatism.cbp b/Extensions/PhysicsAutomatism/PhysicsAutomatism.cbp index 045cbdefda..ea3da11001 100644 --- a/Extensions/PhysicsAutomatism/PhysicsAutomatism.cbp +++ b/Extensions/PhysicsAutomatism/PhysicsAutomatism.cbp @@ -4,7 +4,7 @@