AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxGTK compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-07-27 14:09:25 +00:00
parent ca17eff36b
commit d9ea011f4d
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/defs.h
View File

@ -583,9 +583,12 @@ enum
#define wxWANTS_CHARS 0x00040000 #define wxWANTS_CHARS 0x00040000
// Make window retained (mostly Motif, I think) // Make window retained (mostly Motif, I think)
#define wxRETAINED 0x0002000 #define wxRETAINED 0x00020000
#define wxBACKINGSTORE wxRETAINED #define wxBACKINGSTORE wxRETAINED
// don't invalidate the whole window (resulting in a PAINT event) when the
// window is resized (currently, makes sense for wxMSW only)
#define wxNO_FULLREPAINT_ON_RESIZE 0x00010000
/* /*
* wxFrame/wxDialog style flags * wxFrame/wxDialog style flags
*/ */

2
include/wx/gtk/control.h
View File

@ -29,7 +29,7 @@ class wxControl;
// wxControl // wxControl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxControl : public wxControlBase class wxControl : public wxWindow
{ {
DECLARE_DYNAMIC_CLASS(wxControl) DECLARE_DYNAMIC_CLASS(wxControl)

2
include/wx/gtk1/control.h
View File

@ -29,7 +29,7 @@ class wxControl;
// wxControl // wxControl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxControl : public wxControlBase class wxControl : public wxWindow
{ {
DECLARE_DYNAMIC_CLASS(wxControl) DECLARE_DYNAMIC_CLASS(wxControl)

2
src/gtk/control.cpp
View File

@ -38,7 +38,7 @@ wxControl::wxControl( wxWindow *parent,
void wxControl::SetLabel( const wxString &label ) void wxControl::SetLabel( const wxString &label )
{ {
m_label = _T(""); m_label.Empty();
for ( const wxChar *pc = label; *pc != _T('\0'); pc++ ) for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
{ {
if ( *pc == _T('&') ) if ( *pc == _T('&') )

2
src/gtk/window.cpp
View File

@ -2011,7 +2011,7 @@ void wxWindow::PreCreation( wxWindow *parent,
{ {
wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") ); wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
if ( !CreateBase(parent, id, pos, size, style, name) ) if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
{ {
wxFAIL_MSG(_T("window creation failed")); wxFAIL_MSG(_T("window creation failed"));
} }

2
src/gtk1/control.cpp
View File

@ -38,7 +38,7 @@ wxControl::wxControl( wxWindow *parent,
void wxControl::SetLabel( const wxString &label ) void wxControl::SetLabel( const wxString &label )
{ {
m_label = _T(""); m_label.Empty();
for ( const wxChar *pc = label; *pc != _T('\0'); pc++ ) for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
{ {
if ( *pc == _T('&') ) if ( *pc == _T('&') )

2
src/gtk1/window.cpp
View File

@ -2011,7 +2011,7 @@ void wxWindow::PreCreation( wxWindow *parent,
{ {
wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") ); wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
if ( !CreateBase(parent, id, pos, size, style, name) ) if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
{ {
wxFAIL_MSG(_T("window creation failed")); wxFAIL_MSG(_T("window creation failed"));
} }