(Open Watcom but not only) compilation warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -83,7 +83,7 @@ public:
|
|||||||
|
|
||||||
// Define an array of process pointers used by MyFrame
|
// Define an array of process pointers used by MyFrame
|
||||||
class MyPipedProcess;
|
class MyPipedProcess;
|
||||||
WX_DEFINE_ARRAY(MyPipedProcess *, MyProcessesArray);
|
WX_DEFINE_ARRAY_NO_PTR(MyPipedProcess *, MyProcessesArray);
|
||||||
|
|
||||||
// Define a new frame type: this is going to be our main frame
|
// Define a new frame type: this is going to be our main frame
|
||||||
class MyFrame : public wxFrame
|
class MyFrame : public wxFrame
|
||||||
|
@@ -104,7 +104,7 @@ private:
|
|||||||
// structure describing a registry key/value
|
// structure describing a registry key/value
|
||||||
class TreeNode : public wxTreeItemData
|
class TreeNode : public wxTreeItemData
|
||||||
{
|
{
|
||||||
WX_DEFINE_ARRAY(TreeNode *, TreeChildren);
|
WX_DEFINE_ARRAY_NO_PTR(TreeNode *, TreeChildren);
|
||||||
public:
|
public:
|
||||||
RegTreeCtrl *m_pTree; // must be !NULL
|
RegTreeCtrl *m_pTree; // must be !NULL
|
||||||
TreeNode *m_pParent; // NULL only for the root node
|
TreeNode *m_pParent; // NULL only for the root node
|
||||||
@@ -1071,7 +1071,7 @@ void RegTreeCtrl::GoTo(const wxString& location)
|
|||||||
void RegTreeCtrl::DeleteSelected()
|
void RegTreeCtrl::DeleteSelected()
|
||||||
{
|
{
|
||||||
long lCurrent = GetSelection(),
|
long lCurrent = GetSelection(),
|
||||||
lParent = GetParent(lCurrent);
|
lParent = GetItemParent(lCurrent);
|
||||||
|
|
||||||
if ( lParent == 0 ) {
|
if ( lParent == 0 ) {
|
||||||
wxLogError(wxT("Can't delete root key."));
|
wxLogError(wxT("Can't delete root key."));
|
||||||
|
@@ -571,7 +571,8 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
|
|||||||
wxYield();
|
wxYield();
|
||||||
|
|
||||||
// Get the data
|
// Get the data
|
||||||
wxFileOutputStream sout( wxT("test.url") );
|
wxFile fileTest(wxT("test.url"));
|
||||||
|
wxFileOutputStream sout(fileTest);
|
||||||
if (!sout.Ok())
|
if (!sout.Ok())
|
||||||
{
|
{
|
||||||
m_text->AppendText(_("Error: couldn't open file for output\n"));
|
m_text->AppendText(_("Error: couldn't open file for output\n"));
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
class MyThread;
|
class MyThread;
|
||||||
WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
|
WX_DEFINE_ARRAY_NO_PTR(wxThread *, wxArrayThread);
|
||||||
|
|
||||||
// Define a new application type
|
// Define a new application type
|
||||||
class MyApp : public wxApp
|
class MyApp : public wxApp
|
||||||
|
@@ -83,10 +83,10 @@ protected:
|
|||||||
|
|
||||||
void OnCheckOrRadioBox(wxCommandEvent& event);
|
void OnCheckOrRadioBox(wxCommandEvent& event);
|
||||||
|
|
||||||
void OnSpinBtn(wxCommandEvent& event);
|
void OnSpinBtn(wxSpinEvent& event);
|
||||||
void OnSpinBtnUp(wxCommandEvent& event);
|
void OnSpinBtnUp(wxSpinEvent& event);
|
||||||
void OnSpinBtnDown(wxCommandEvent& event);
|
void OnSpinBtnDown(wxSpinEvent& event);
|
||||||
void OnSpinCtrl(wxCommandEvent& event);
|
void OnSpinCtrl(wxSpinEvent& event);
|
||||||
|
|
||||||
void OnUpdateUIValueButton(wxUpdateUIEvent& event);
|
void OnUpdateUIValueButton(wxUpdateUIEvent& event);
|
||||||
void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
|
void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
|
||||||
@@ -394,7 +394,7 @@ void SpinBtnWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
|
|||||||
event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue()));
|
event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event)
|
void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
|
||||||
{
|
{
|
||||||
int value = event.GetInt();
|
int value = event.GetInt();
|
||||||
|
|
||||||
@@ -404,19 +404,19 @@ void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event)
|
|||||||
wxLogMessage(_T("Spin button value changed, now %d"), value);
|
wxLogMessage(_T("Spin button value changed, now %d"), value);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpinBtnWidgetsPage::OnSpinBtnUp(wxCommandEvent& event)
|
void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
|
||||||
{
|
{
|
||||||
wxLogMessage( _T("Spin button value incremented, will be %ld (was %d)"),
|
wxLogMessage( _T("Spin button value incremented, will be %ld (was %d)"),
|
||||||
event.GetInt(), m_spinbtn->GetValue() );
|
event.GetInt(), m_spinbtn->GetValue() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpinBtnWidgetsPage::OnSpinBtnDown(wxCommandEvent& event)
|
void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
|
||||||
{
|
{
|
||||||
wxLogMessage( _T("Spin button value decremented, will be %ld (was %d)"),
|
wxLogMessage( _T("Spin button value decremented, will be %ld (was %d)"),
|
||||||
event.GetInt(), m_spinbtn->GetValue() );
|
event.GetInt(), m_spinbtn->GetValue() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event)
|
void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
|
||||||
{
|
{
|
||||||
if (!m_spinctrl)
|
if (!m_spinctrl)
|
||||||
return;
|
return;
|
||||||
|
@@ -164,7 +164,7 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// array of pages
|
// array of pages
|
||||||
WX_DEFINE_ARRAY(WidgetsPage *, ArrayWidgetsPage);
|
WX_DEFINE_ARRAY_NO_PTR(WidgetsPage *, ArrayWidgetsPage);
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// misc macros
|
// misc macros
|
||||||
|
Reference in New Issue
Block a user