Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some bugfixes for silly compile errors and painting issues in windoze

This commit is contained in:
Mark Vejvoda 2010-05-04 08:15:16 +00:00
parent 4b1a392f00
commit 605dd746c0
5 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

2
mk/windoze/glest_editor.vcproj
View File

@ -117,7 +117,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/arch:SSE2"
AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common"
AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/SDL-1.2.14/include&quot;"
PreprocessorDefinitions="MWIN;__WXMSW__"
StringPooling="true"
ExceptionHandling="2"

35
source/glest_map_editor/main.cpp
View File

@ -10,15 +10,14 @@
// ==============================================================
#include "main.h"
#include <ctime>
#include "conversion.h"
#include "icons.h"
#include "platform_common.h"
#include <iostream>
using namespace Shared::Util;
using namespace Shared::PlatformCommon;
using namespace std;
namespace MapEditor {
@ -288,10 +287,10 @@ MainWindow::MainWindow()
this->panel->SetSizer(boxsizer);
this->Layout();
#ifndef WIN32
//#ifndef WIN32
timer = new wxTimer(this);
timer->Start(100);
#endif
//#endif
glCanvas->SetFocus();
}
@ -301,13 +300,14 @@ void MainWindow::onToolPlayer(wxCommandEvent& event){
void MainWindow::init(string fname) {
glCanvas->SetCurrent();
program = new Program(glCanvas->GetClientSize().x, glCanvas->GetClientSize().y);
fileName = "New (unsaved) Map";
if (!fname.empty() && fileExists(fname)) {
program->loadMap(fname);
currentFile = fname;
fileName = cutLastExt(basename(fname.c_str()));
fileName = cutLastExt(extractFileFromDirectoryPath(fname.c_str()));
}
SetTitle(ToUnicode(winHeader + "; " + currentFile));
setDirty(false);
@ -355,6 +355,9 @@ void MainWindow::setExtension() {
void MainWindow::onTimer(wxTimerEvent &event) {
wxPaintEvent paintEvent;
onPaint(paintEvent);
#ifdef WIN32
Update();
#endif
}
void MainWindow::onMouseDown(wxMouseEvent &event, int x, int y) {
@ -414,7 +417,7 @@ void MainWindow::onMenuFileLoad(wxCommandEvent &event) {
if (fileDialog.ShowModal() == wxID_OK) {
currentFile = fileDialog.GetPath().ToAscii();
program->loadMap(currentFile);
fileName = cutLastExt(basename(currentFile.c_str()));
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
setDirty(false);
setExtension();
SetTitle(ToUnicode(winHeader + "; " + currentFile));
@ -439,7 +442,7 @@ void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
currentFile = fileDialog.GetPath().ToAscii();
setExtension();
program->saveMap(currentFile);
fileName = cutLastExt(basename(currentFile.c_str()));
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
setDirty(false);
}
SetTitle(ToUnicode(winHeader + "; " + currentFile));
@ -910,6 +913,7 @@ void GlCanvas::onKeyDown(wxKeyEvent &event) {
mainWindow->onKeyDown(event);
}
BEGIN_EVENT_TABLE(GlCanvas, wxGLCanvas)
EVT_KEY_DOWN(GlCanvas::onKeyDown)
@ -926,7 +930,7 @@ void SimpleDialog::addValue(const string &key, const string &value) {
}
string SimpleDialog::getValue(const string &key) {
for (int i = 0; i < values.size(); ++i) {
for (unsigned int i = 0; i < values.size(); ++i) {
if (values[i].first == key) {
return values[i].second;
}
@ -952,7 +956,7 @@ void SimpleDialog::show() {
ShowModal();
for (int i = 0; i < texts.size(); ++i) {
for (unsigned int i = 0; i < texts.size(); ++i) {
values[i].second = texts[i]->GetValue().ToAscii();
}
}
@ -970,6 +974,15 @@ bool App::OnInit() {
mainWindow = new MainWindow();
mainWindow->Show();
mainWindow->init(fileparam);
mainWindow->Update();
#ifdef WIN32
wxPoint pos = mainWindow->GetScreenPosition();
wxSize size = mainWindow->GetSize();
mainWindow->SetSize(pos.x, pos.y, size.x-1, size.y, wxSIZE_FORCE);
mainWindow->Update();
#endif
return true;
}

4
source/shared_lib/include/platform/common/platform_common.h
View File

@ -22,11 +22,10 @@
#include <stdexcept>
#include <list>
#include <SDL.h>
#include "types.h"
#include "checksum.h"
#include <utility>
#include <SDL.h>
using std::string;
using std::vector;
@ -112,6 +111,7 @@ vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(ve
vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap);
void createDirectoryPaths(string Path);
string extractFileFromDirectoryPath(string filename);
string extractDirectoryPathFromFile(string filename);
string extractExtension(const string& filename);

25
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@ -558,9 +558,32 @@ vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(co
return crcTreeCache[cacheKey];
}
string extractFileFromDirectoryPath(string filename)
{
size_t lastDirectory_Win = filename.find_last_of('\\');
size_t lastDirectory_Lin = filename.find_last_of('/');
size_t lastDirectory = (lastDirectory_Win<lastDirectory_Lin)?lastDirectory_Lin:lastDirectory_Win;
//return filename.substr( 0, filename.rfind("/")+1 );
if (lastDirectory == string::npos) {
return filename;
}
return filename.erase( 0, lastDirectory + 1);
}
string extractDirectoryPathFromFile(string filename)
{
return filename.substr( 0, filename.rfind("/")+1 );
size_t lastDirectory_Win = filename.find_last_of('\\');
size_t lastDirectory_Lin = filename.find_last_of('/');
size_t lastDirectory = (lastDirectory_Win<lastDirectory_Lin)?lastDirectory_Lin:lastDirectory_Win;
//return filename.substr( 0, filename.rfind("/")+1 );
if (lastDirectory == string::npos) {
return "";
}
return filename.substr( 0, lastDirectory + 1);
}
string extractExtension(const string& filepath) {