root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 80

Browse Source 
Files correlati     : xvaga
Ricompilazione Demo : [ ]
Commento            :

forse va !!!!


git-svn-id: svn://10.65.10.50/trunk@16791 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2008-06-20 05:28:10 +00:00
parent a8bd3f2af3
commit bed3ea36ef
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xvaga/xvaga.cpp
View File

@ -60,7 +60,6 @@ class TMessageBox : public wxDialog
{ {
protected: protected:
void OnButton(wxCommandEvent& evt); void OnButton(wxCommandEvent& evt);
void OnMouseCaptureLost(wxMouseCaptureLostEvent& evt);
void AddButton(wxSizer* sz, int id, int ico); void AddButton(wxSizer* sz, int id, int ico);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@ -70,7 +69,6 @@ public:
BEGIN_EVENT_TABLE(TMessageBox, wxDialog) BEGIN_EVENT_TABLE(TMessageBox, wxDialog)
EVT_BUTTON(wxID_ANY, TMessageBox::OnButton) EVT_BUTTON(wxID_ANY, TMessageBox::OnButton)
EVT_MOUSE_CAPTURE_LOST(TMessageBox::OnMouseCaptureLost)
END_EVENT_TABLE() END_EVENT_TABLE()
void TMessageBox::OnButton(wxCommandEvent& evt) void TMessageBox::OnButton(wxCommandEvent& evt)
@ -86,13 +84,6 @@ void TMessageBox::OnButton(wxCommandEvent& evt)
EndModal(ec); EndModal(ec);
} }
void TMessageBox::OnMouseCaptureLost(wxMouseCaptureLostEvent& e)
{
e.Skip();
// Segnaposto inutile nella realta' ... ma indispensabile per qualche genio di wxWidgets
}
void TMessageBox::AddButton(wxSizer* sz, int id, int WXUNUSED(ico)) void TMessageBox::AddButton(wxSizer* sz, int id, int WXUNUSED(ico))
{ {
sz->Add(new wxButton(this, id, wxEmptyString, wxDefaultPosition, sz->Add(new wxButton(this, id, wxEmptyString, wxDefaultPosition,
@ -158,9 +149,9 @@ int _MessageBox(const wxString& msg, int nStyle)
{ {
xvt_dm_post_speech(msg, 1, TRUE); xvt_dm_post_speech(msg, 1, TRUE);
int ret = ::wxMessageBox(msg, _GetAppTitle(), nStyle); //int ret = ::wxMessageBox(msg, _GetAppTitle(), nStyle);
/* TMessageBox dlg(msg, nStyle); TMessageBox dlg(msg, nStyle);
const int ret = dlg.ShowModal(); */ const int ret = dlg.ShowModal();
switch(ret) switch(ret)
{ {

8
xvaga/xvtctl.cpp
View File

@ -168,6 +168,7 @@ protected:
public: public:
int Add(short nIconId, const wxString strText, int nFlags); int Add(short nIconId, const wxString strText, int nFlags);
TwxOutlookBar(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style); TwxOutlookBar(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
~TwxOutlookBar();
}; };
WINDOW xvt_ctl_create_def(WIN_DEF *win_def_p, WINDOW parent_win, long app_data) WINDOW xvt_ctl_create_def(WIN_DEF *win_def_p, WINDOW parent_win, long app_data)
@ -1205,6 +1206,13 @@ TwxOutlookBar::TwxOutlookBar(wxWindow *parent, wxWindowID id,
SetItemCount(0); SetItemCount(0);
} }
TwxOutlookBar::~TwxOutlookBar()
{
if (HasCapture())
ReleaseMouse();
}
int xvt_list_add_item(WINDOW win, short icon, const char* text, int flags) int xvt_list_add_item(WINDOW win, short icon, const char* text, int flags)
{ {
int n = -1; int n = -1;

2
xvaga/xvtwin.cpp
View File

@ -931,6 +931,8 @@ TwxWindow::TwxWindow(wxWindow *parent, wxWindowID id, const wxString& title,
TwxWindow::~TwxWindow() TwxWindow::~TwxWindow()
{ {
if (HasCapture())
ReleaseMouse();
EVENT e; memset(&e, 0, sizeof(EVENT)); EVENT e; memset(&e, 0, sizeof(EVENT));
e.type = E_DESTROY; e.type = E_DESTROY;
DoXvtEvent(e); DoXvtEvent(e);