diff --git a/mk/windoze/glest_game.cbp b/mk/windoze/glest_game.cbp index 7f4df7bb1..440f8d896 100644 --- a/mk/windoze/glest_game.cbp +++ b/mk/windoze/glest_game.cbp @@ -131,7 +131,8 @@ - diff --git a/mk/windoze/glest_game.layout b/mk/windoze/glest_game.layout index 9beab4367..1899eb056 100644 --- a/mk/windoze/glest_game.layout +++ b/mk/windoze/glest_game.layout @@ -4,10 +4,10 @@ - - + + - + @@ -19,9 +19,18 @@ + + + + + + + + + @@ -34,11 +43,11 @@ - + - - + + diff --git a/mk/windoze/megaglest.workspace b/mk/windoze/megaglest.workspace index 0bd3e0323..85e03a686 100644 --- a/mk/windoze/megaglest.workspace +++ b/mk/windoze/megaglest.workspace @@ -4,6 +4,8 @@ - + + + diff --git a/mk/windoze/shared_lib.cbp b/mk/windoze/shared_lib.cbp index 2575444ab..2a7c2d747 100644 --- a/mk/windoze/shared_lib.cbp +++ b/mk/windoze/shared_lib.cbp @@ -214,6 +214,7 @@ + @@ -234,7 +235,6 @@ - @@ -255,6 +255,7 @@ + @@ -271,8 +272,8 @@ - + @@ -301,6 +302,7 @@ + @@ -321,7 +323,6 @@ - @@ -342,6 +343,7 @@ + diff --git a/mk/windoze/shared_lib.layout b/mk/windoze/shared_lib.layout index bb7e9b306..430e18e3d 100644 --- a/mk/windoze/shared_lib.layout +++ b/mk/windoze/shared_lib.layout @@ -1,13 +1,13 @@ - + - + - + @@ -22,7 +22,7 @@ - + @@ -52,10 +52,10 @@ - + - + @@ -64,13 +64,13 @@ - + - + diff --git a/source/configurator/configuration.cpp b/source/configurator/configuration.cpp index ef51fa3ad..c2deb1fb0 100644 --- a/source/configurator/configuration.cpp +++ b/source/configurator/configuration.cpp @@ -218,7 +218,12 @@ void IntField::createControl(wxWindow *parent, wxSizer *sizer){ } void IntField::updateValue(){ +#if defined(__MINGW32__) + const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(textCtrl->GetValue())); + value = tmp_buf; +#else value= (const char*)wxFNCONV(textCtrl->GetValue()); +#endif } void IntField::updateControl(){ @@ -245,7 +250,13 @@ void FloatField::createControl(wxWindow *parent, wxSizer *sizer){ } void FloatField::updateValue(){ + +#if defined(__MINGW32__) + const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(textCtrl->GetValue())); + value = tmp_buf; +#else value= (const char*)wxFNCONV(textCtrl->GetValue()); +#endif } void FloatField::updateControl(){ @@ -273,7 +284,13 @@ void StringField::createControl(wxWindow *parent, wxSizer *sizer){ } void StringField::updateValue(){ + +#if defined(__MINGW32__) + const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(textCtrl->GetValue())); + value = tmp_buf; +#else value= (const char*)wxFNCONV(textCtrl->GetValue()); +#endif } void StringField::updateControl(){ @@ -298,7 +315,13 @@ void EnumField::createControl(wxWindow *parent, wxSizer *sizer){ } void EnumField::updateValue(){ +#if defined(__MINGW32__) + const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(comboBox->GetValue())); + value = tmp_buf; +#else value= (const char*)wxFNCONV(comboBox->GetValue()); +#endif + } void EnumField::updateControl(){ @@ -366,7 +389,12 @@ void FloatRangeField::createControl(wxWindow *parent, wxSizer *sizer){ } void FloatRangeField::updateValue(){ +#if defined(__MINGW32__) + const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(textCtrl->GetValue())); + value = tmp_buf; +#else value= (const char*)wxFNCONV(textCtrl->GetValue()); +#endif } void FloatRangeField::updateControl(){ diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index d8ed57e85..e7aa23373 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -135,7 +135,13 @@ MainWindow::MainWindow(const string &modelPath) wxInitAllImageHandlers(); #ifdef WIN32 - wxIcon icon("IDI_ICON1"); + +#if defined(__MINGW32__) + wxIcon icon(ToUnicode("IDI_ICON1")); +#else + wxIcon icon("IDI_ICON1"); +#endif + #else wxIcon icon; std::ifstream testFile("g3dviewer.ico"); @@ -978,7 +984,14 @@ bool App::OnInit(){ std::cout << "Press R to restart particles, this also reloads all files if they are changed." << std::endl << std::endl; exit (0); } - modelPath= wxFNCONV(argv[1]); + +#if defined(__MINGW32__) + const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(argv[1])); + modelPath = tmp_buf; +#else + modelPath = wxFNCONV(argv[1]); +#endif + } mainWindow= new MainWindow(modelPath);