Index: AE/Installer/trunk/source/about.cpp =================================================================== --- AE/Installer/trunk/source/about.cpp (revision 410) +++ AE/Installer/trunk/source/about.cpp (revision 411) @@ -1,4 +1,4 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: about.cpp +// Name: about_window.cpp // Purpose: // Author: @@ -24,5 +24,5 @@ ////@end includes -#include "about.h" +#include "about_window.h" ////@begin XPM images @@ -71,8 +71,8 @@ bool About::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { -////@begin About creation + ////@begin About creation SetExtraStyle(wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); - + CreateControls(); if (GetSizer()) @@ -81,5 +81,5 @@ } Centre(); -////@end About creation + ////@end About creation return true; } @@ -92,6 +92,6 @@ About::~About() { -////@begin About destruction -////@end About destruction + ////@begin About destruction + ////@end About destruction } @@ -103,6 +103,6 @@ void About::Init() { -////@begin About member initialisation -////@end About member initialisation + ////@begin About member initialisation + ////@end About member initialisation } @@ -114,34 +114,34 @@ void About::CreateControls() { -////@begin About content construction + ////@begin About content construction About* itemDialog1 = this; - + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); itemDialog1->SetSizer(itemBoxSizer2); - + wxPanel* itemPanel3 = new wxPanel( itemDialog1, ID_PANEL2, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); itemBoxSizer2->Add(itemPanel3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - + wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); itemPanel3->SetSizer(itemBoxSizer4); - - wxStaticText* itemStaticText5 = new wxStaticText( itemPanel3, wxID_STATIC, _("Mod Installer v1.0\nby Gumby and Iritscen\n\nAE credited to:\nEdT: BGI troops, additional weapons\ngeyser: Original creator\nGumby: Not much :)\nLoser: All his animation work\nNeo: Making OniSplit, documenting Oni, and lots of technical support\nONIrules: Additional weapons\nParadox: More documenting of Oni\nRossyMiles: Daodan DLL port to C\nSeventeen Seconds: Additional weapons\nSFeLi: Original Daodan DLL\nssg: Documenting Oni"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); + + wxStaticText* itemStaticText5 = new wxStaticText( itemPanel3, wxID_STATIC, _("Mod Installer v1.0\nby Gumby and Iritscen\n\nAE credited to:\nEdT: BGI troops, additional weapons\ngeyser: Original creator\nGumby: Installer and Framework\nIritscen:Installer (Mac)\nLoser: Improved animation and AI\nNeo: OniSplit, documenting Oni, tech support\nONIrules: Additional weapons\nParadox: Documenting of Oni\nRossyMiles: Daodan DLL port to C\nSFeLi: Original Daodan DLL\nssg: Documenting Oni"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_LEFT|wxALL, 5); - + wxStaticLine* itemStaticLine6 = new wxStaticLine( itemPanel3, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); itemBoxSizer4->Add(itemStaticLine6, 0, wxGROW|wxALL, 5); - - wxStaticText* itemStaticText7 = new wxStaticText( itemPanel3, wxID_STATIC, _("oni.bungie.org"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer4->Add(itemStaticText7, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - + + wxTextCtrl* itemTextCtrl7 = new wxTextCtrl( itemPanel3, wxID_STATIC, _("oni.bungie.org"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); + itemBoxSizer4->Add(itemTextCtrl7, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxStdDialogButtonSizer* itemStdDialogButtonSizer8 = new wxStdDialogButtonSizer; - + itemBoxSizer4->Add(itemStdDialogButtonSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxButton* itemButton9 = new wxButton( itemPanel3, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); itemStdDialogButtonSizer8->AddButton(itemButton9); - + itemStdDialogButtonSizer8->Realize(); - -////@end About content construction + + ////@end About content construction } @@ -163,8 +163,8 @@ { // Bitmap retrieval -////@begin About bitmap retrieval + ////@begin About bitmap retrieval wxUnusedVar(name); return wxNullBitmap; -////@end About bitmap retrieval + ////@end About bitmap retrieval } @@ -176,7 +176,7 @@ { // Icon retrieval -////@begin About icon retrieval + ////@begin About icon retrieval wxUnusedVar(name); return wxNullIcon; -////@end About icon retrieval + ////@end About icon retrieval } Index: AE/Installer/trunk/source/about.h =================================================================== --- AE/Installer/trunk/source/about.h (revision 410) +++ AE/Installer/trunk/source/about.h (revision 411) @@ -1,4 +1,4 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: about.h +// Name: about_window.h // Purpose: // Author: Index: AE/Installer/trunk/source/about_window.cpp =================================================================== --- AE/Installer/trunk/source/about_window.cpp (revision 410) +++ (revision ) @@ -1,182 +1,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: about_window.cpp -// Purpose: -// Author: -// Modified by: -// Created: 08/05/2009 11:10:32 -// RCS-ID: -// Copyright: -// Licence: -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -////@begin includes -////@end includes - -#include "about_window.h" - -////@begin XPM images -////@end XPM images - - -/* - * About type definition - */ - -IMPLEMENT_DYNAMIC_CLASS( About, wxDialog ) - - -/* - * About event table definition - */ - -BEGIN_EVENT_TABLE( About, wxDialog ) - -////@begin About event table entries -////@end About event table entries - -END_EVENT_TABLE() - - -/* - * About constructors - */ - -About::About() -{ - Init(); -} - -About::About( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) -{ - Init(); - Create(parent, id, caption, pos, size, style); -} - - -/* - * About creator - */ - -bool About::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) -{ - ////@begin About creation - SetExtraStyle(wxWS_EX_BLOCK_EVENTS); - wxDialog::Create( parent, id, caption, pos, size, style ); - - CreateControls(); - if (GetSizer()) - { - GetSizer()->SetSizeHints(this); - } - Centre(); - ////@end About creation - return true; -} - - -/* - * About destructor - */ - -About::~About() -{ - ////@begin About destruction - ////@end About destruction -} - - -/* - * Member initialisation - */ - -void About::Init() -{ - ////@begin About member initialisation - ////@end About member initialisation -} - - -/* - * Control creation for About - */ - -void About::CreateControls() -{ - ////@begin About content construction - About* itemDialog1 = this; - - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); - - wxPanel* itemPanel3 = new wxPanel( itemDialog1, ID_PANEL2, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); - itemBoxSizer2->Add(itemPanel3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); - itemPanel3->SetSizer(itemBoxSizer4); - - wxStaticText* itemStaticText5 = new wxStaticText( itemPanel3, wxID_STATIC, _("Mod Installer v1.0\nby Gumby and Iritscen\n\nAE credited to:\nEdT: BGI troops, additional weapons\ngeyser: Original creator\nGumby: Installer and Framework\nIritscen:Installer (Mac)\nLoser: Improved animation and AI\nNeo: OniSplit, documenting Oni, tech support\nONIrules: Additional weapons\nParadox: Documenting of Oni\nRossyMiles: Daodan DLL port to C\nSFeLi: Original Daodan DLL\nssg: Documenting Oni"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); - itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticLine* itemStaticLine6 = new wxStaticLine( itemPanel3, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - itemBoxSizer4->Add(itemStaticLine6, 0, wxGROW|wxALL, 5); - - wxTextCtrl* itemTextCtrl7 = new wxTextCtrl( itemPanel3, wxID_STATIC, _("oni.bungie.org"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); - itemBoxSizer4->Add(itemTextCtrl7, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxStdDialogButtonSizer* itemStdDialogButtonSizer8 = new wxStdDialogButtonSizer; - - itemBoxSizer4->Add(itemStdDialogButtonSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton9 = new wxButton( itemPanel3, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStdDialogButtonSizer8->AddButton(itemButton9); - - itemStdDialogButtonSizer8->Realize(); - - ////@end About content construction -} - - -/* - * Should we show tooltips? - */ - -bool About::ShowToolTips() -{ - return true; -} - -/* - * Get bitmap resources - */ - -wxBitmap About::GetBitmapResource( const wxString& name ) -{ - // Bitmap retrieval - ////@begin About bitmap retrieval - wxUnusedVar(name); - return wxNullBitmap; - ////@end About bitmap retrieval -} - -/* - * Get icon resources - */ - -wxIcon About::GetIconResource( const wxString& name ) -{ - // Icon retrieval - ////@begin About icon retrieval - wxUnusedVar(name); - return wxNullIcon; - ////@end About icon retrieval -} Index: AE/Installer/trunk/source/about_window.h =================================================================== --- AE/Installer/trunk/source/about_window.h (revision 410) +++ (revision ) @@ -1,93 +1,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: about_window.h -// Purpose: -// Author: -// Modified by: -// Created: 08/05/2009 11:10:32 -// RCS-ID: -// Copyright: -// Licence: -///////////////////////////////////////////////////////////////////////////// - -#ifndef _ABOUT_H_ -#define _ABOUT_H_ - - -/*! - * Includes - */ - -////@begin includes -#include "wx/statline.h" -////@end includes - -/*! - * Forward declarations - */ - -////@begin forward declarations -////@end forward declarations - -/*! - * Control identifiers - */ - -////@begin control identifiers -#define ID_ABOUT 10020 -#define ID_PANEL2 10021 -#define SYMBOL_ABOUT_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX|wxTAB_TRAVERSAL -#define SYMBOL_ABOUT_TITLE _("About AE") -#define SYMBOL_ABOUT_IDNAME ID_ABOUT -#define SYMBOL_ABOUT_SIZE wxSize(400, 300) -#define SYMBOL_ABOUT_POSITION wxDefaultPosition -////@end control identifiers - - -/*! - * About class declaration - */ - -class About: public wxDialog -{ - DECLARE_DYNAMIC_CLASS( About ) - DECLARE_EVENT_TABLE() - -public: - /// Constructors - About(); - About( wxWindow* parent, wxWindowID id = SYMBOL_ABOUT_IDNAME, const wxString& caption = SYMBOL_ABOUT_TITLE, const wxPoint& pos = SYMBOL_ABOUT_POSITION, const wxSize& size = SYMBOL_ABOUT_SIZE, long style = SYMBOL_ABOUT_STYLE ); - - /// Creation - bool Create( wxWindow* parent, wxWindowID id = SYMBOL_ABOUT_IDNAME, const wxString& caption = SYMBOL_ABOUT_TITLE, const wxPoint& pos = SYMBOL_ABOUT_POSITION, const wxSize& size = SYMBOL_ABOUT_SIZE, long style = SYMBOL_ABOUT_STYLE ); - - /// Destructor - ~About(); - - /// Initialises member variables - void Init(); - - /// Creates the controls and sizers - void CreateControls(); - -////@begin About event handler declarations - -////@end About event handler declarations - -////@begin About member function declarations - - /// Retrieves bitmap resources - wxBitmap GetBitmapResource( const wxString& name ); - - /// Retrieves icon resources - wxIcon GetIconResource( const wxString& name ); -////@end About member function declarations - - /// Should we show tooltips? - static bool ShowToolTips(); - -////@begin About member variables -////@end About member variables -}; - -#endif - // _ABOUT_H_