Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes to wxWidgets/SDL2 port :

Browse source 
- Updated UI
- OpenGL 3.0 with GLSL/GLSLP-support
- Improvements to Windows version
- Minor changes/bugfixes
Patch from bit.
This commit is contained in:
pcem_emulator 2017-07-30 10:39:27 +01:00
commit 2881d35680
90 changed files with 15042 additions and 5351 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/wx-dialogbox.cc
View file

@ -1,5 +1,3 @@
#include "wx-dialogbox.h"
#include <wx/wxprec.h>
#ifndef WX_PRECOMP
@ -7,19 +5,34 @@
#endif
#include <wx/xrc/xmlres.h>
#include <wx/notebook.h>
#include "wx-dialogbox.h"
#include "wx-utils.h"
BEGIN_EVENT_TABLE(PCemDialogBox, wxDialog) END_EVENT_TABLE()
class CommandValue: public wxObject
{
public:
CommandValue(int value) { this->value = value; }
int GetValue() { return this->value; }
private:
int value;
};
PCemDialogBox::PCemDialogBox(wxWindow* parent, int (*callback)(void* window, int message, INT_PARAM param1, LONG_PARAM param2)) :
wxDialog(parent, -1, "No title")
{
this->callback = callback;
this->commandActive = false;
}
PCemDialogBox::PCemDialogBox(wxWindow* parent, const char* name, int (*callback)(void* window, int message, INT_PARAM param1, LONG_PARAM param2))
{
wxXmlResource::Get()->LoadDialog(this, parent, name);
this->callback = callback;
this->commandActive = false;
}
void PCemDialogBox::OnInit()
@ -28,8 +41,11 @@ void PCemDialogBox::OnInit()
{
callback(this, WX_INITDIALOG, 0, 0);
Bind(wxEVT_BUTTON, &PCemDialogBox::OnCommand, this);
Bind(wxEVT_RADIOBUTTON, &PCemDialogBox::OnCommand, this);
Bind(wxEVT_TEXT, &PCemDialogBox::OnCommand, this);
Bind(wxEVT_COMBOBOX, &PCemDialogBox::OnCommand, this);
Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &PCemDialogBox::OnNotebookChanged, this);
Bind(wxEVT_LISTBOX_DCLICK, &PCemDialogBox::OnCommand, this, wxID_ANY, wxID_ANY, new CommandValue(WX_LBN_DBLCLK));
}
wxWindow* root = FindWindow(XRCID("ROOT_PANEL"));
@ -38,8 +54,31 @@ void PCemDialogBox::OnInit()
Fit();
}
void PCemDialogBox::OnCommand(wxCommandEvent& event)
int PCemDialogBox::processEvent(int message, INT_PARAM param1, LONG_PARAM param2)
{
callback(this, WX_COMMAND, event.GetId(), 0);
int result = 0;
/* lock the current command to prevent strange behavior */
if (!commandActive)
{
commandActive = true;
result = callback(this, message, param1, param2);
commandActive = false;
}
return result;
}
void PCemDialogBox::OnNotebookChanged(wxCommandEvent& event)
{
wxBookCtrlEvent* ev = (wxBookCtrlEvent*)&event;
processEvent(WX_COMMAND, ev->GetId(), ev->GetSelection());
}
void PCemDialogBox::OnCommand(wxCommandEvent& event)
{
LONG_PARAM val = 0;
CommandValue* c = (CommandValue*)event.GetEventUserData();
if (c)
val = c->GetValue();
processEvent(WX_COMMAND, event.GetId(), val);
}