Fixed wxCheckBox on wxGTK (SetLabel called before widget creation),
wxListBox::GetSelection returning -1 now doesn't assert; wxProp improvements for wxGTK; parser.y includes <io.h> under VC++ to eliminate 'read' warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,6 +4,9 @@ static char yysccsid[] = "@(#)yaccpar 1.7 (Berkeley) 09/09/90";
|
||||
#define YYBYACC 1
|
||||
#line 2 "parser.y"
|
||||
#include "string.h"
|
||||
#ifdef _MSC_VER
|
||||
#include <io.h>
|
||||
#endif
|
||||
#include "wx/expr.h"
|
||||
|
||||
#ifndef __EXTERN_C__
|
||||
|
@@ -1,5 +1,9 @@
|
||||
%{
|
||||
#include <string.h>
|
||||
#ifdef _MSC_VER
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#include "wx/expr.h"
|
||||
|
||||
#ifndef __EXTERN_C__
|
||||
|
@@ -56,7 +56,7 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
|
||||
|
||||
SetValidator( validator );
|
||||
|
||||
SetLabel( label );
|
||||
wxControl::SetLabel( label );
|
||||
|
||||
m_widget = gtk_check_button_new_with_label( m_label );
|
||||
|
||||
|
@@ -234,7 +234,9 @@ int wxListBox::GetSelection(void) const
|
||||
child = child->next;
|
||||
}
|
||||
}
|
||||
wxFAIL_MSG("wrong listbox index");
|
||||
// No, I think it's reasonable to return -1 to indicate
|
||||
// there is no selection. -- JACS
|
||||
// wxFAIL_MSG("wrong listbox index");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@@ -56,7 +56,7 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
|
||||
|
||||
SetValidator( validator );
|
||||
|
||||
SetLabel( label );
|
||||
wxControl::SetLabel( label );
|
||||
|
||||
m_widget = gtk_check_button_new_with_label( m_label );
|
||||
|
||||
|
@@ -234,7 +234,9 @@ int wxListBox::GetSelection(void) const
|
||||
child = child->next;
|
||||
}
|
||||
}
|
||||
wxFAIL_MSG("wrong listbox index");
|
||||
// No, I think it's reasonable to return -1 to indicate
|
||||
// there is no selection. -- JACS
|
||||
// wxFAIL_MSG("wrong listbox index");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user