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

Patch level : 10.0

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


git-svn-id: svn://10.65.10.50/trunk@16948 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-07-25 15:12:34 +00:00
parent adfdae01ed
commit e42671d911
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xvaga/xvaga.cpp
View File

@ -549,7 +549,8 @@ void xvt_app_create(int argc, char **argv, unsigned long flags,
void xvt_app_destroy(void) void xvt_app_destroy(void)
{ {
wxTheApp->ExitMainLoop(); wxTheApp->ExitMainLoop();
_task_win->Destroy(); if (_task_win != NULL)
_task_win->Destroy();
#ifdef SPEECH_API #ifdef SPEECH_API
xvt_dm_enable_speech(0x00); xvt_dm_enable_speech(0x00);
@ -4509,15 +4510,18 @@ WINDOW statbar_create(int cid, int left, int top, int right, int bottom,
int prop_count, char **prop_list, WINDOW parent_win, int prop_count, char **prop_list, WINDOW parent_win,
int parent_rid, long parent_flags, char *parent_class) int parent_rid, long parent_flags, char *parent_class)
{ {
wxFrame& w = *wxStaticCast((wxObject*)parent_win, wxFrame); wxStatusBar* pStatusBar = NULL;
wxFrame* w = wxDynamicCast(_nice_windows.Get(parent_win), wxFrame);
const int nStyle = 0; // not wxST_SIZEGRIP if (w != NULL)
wxStatusBar* pStatusBar = w.CreateStatusBar(2, nStyle);
if (pStatusBar != NULL)
{ {
const wxSize sz = pStatusBar->GetSize(); const int nStyle = 0; // not wxST_SIZEGRIP
const int widths[2] = { -1, 320 }; pStatusBar = w->CreateStatusBar(2, nStyle);
pStatusBar->SetStatusWidths(2, widths); if (pStatusBar != NULL)
{
const wxSize sz = pStatusBar->GetSize();
const int widths[2] = { -1, 320 };
pStatusBar->SetStatusWidths(2, widths);
}
} }
return (WINDOW)pStatusBar; return (WINDOW)pStatusBar;
} }

1
xvaga/xvtwin.cpp
View File

@ -1129,6 +1129,7 @@ TTaskWin::TTaskWin(wxWindowID id, const wxString& title,
TTaskWin::~TTaskWin() TTaskWin::~TTaskWin()
{ {
_task_win = NULL;
_nice_windows.Delete((WINDOW)this); _nice_windows.Delete((WINDOW)this);
if (m_menu) if (m_menu)
{ {