Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix for dynarray,

Browse Source 
Use wxStreams in dialoged,
  Small typo in wxApp::OnIdle()
  Distrib things,
  wxPython makefile corrections (libpy.c and libptr.c missing)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-05 20:38:51 +00:00
parent 48e74ff549
commit e70f5e1301
16 changed files with 45 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/dynarray.h
View File

@@ -174,9 +174,11 @@ class WXDLLEXPORT name : public wxBaseArray \
{ \
public: \
name() \
{ size_t type = sizeof(T); \
{ \
size_t type = sizeof(T); \
size_t sizelong = sizeof(long); \
wxASSERT( type <= sizelong ); \
if ( type <= sizelong ) \
{ wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); } \
} \
\
name& operator=(const name& src) \
@@ -237,7 +239,8 @@ public: \
name(SCMPFUNC##T fn) \
{ size_t type = sizeof(T); \
size_t sizelong = sizeof(long); \
wxASSERT( type <= sizelong ); \
if ( type <= sizelong ) \
{ wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); } \
m_fnCompare = fn; \
} \
\

10
include/wx/resource.h
View File

@@ -88,10 +88,10 @@ class WXDLLEXPORT wxItemResource: public wxObject
inline long GetStyle() const { return m_windowStyle; }
inline int GetId() const { return m_windowId; }
inline long GetValue1() const { return m_value1; }
inline long GetValue2() const { return m_value2; }
inline long GetValue3() const { return m_value3; }
inline long GetValue5() const { return m_value5; }
inline wxInt32 GetValue1() const { return m_value1; }
inline wxInt32 GetValue2() const { return m_value2; }
inline wxInt32 GetValue3() const { return m_value3; }
inline wxInt32 GetValue5() const { return m_value5; }
inline wxString GetValue4() const { return m_value4; }
inline wxList& GetChildren() const { return (wxList&) m_children; }
inline wxStringList& GetStringValues() const { return (wxStringList&) m_stringValues; }
@@ -105,7 +105,7 @@ class WXDLLEXPORT wxItemResource: public wxObject
inline wxColour& GetButtonColour() const { return (wxColour&) m_buttonColour; }
inline void SetResourceStyle(long style) { m_exStyle = style; }
inline long GetResourceStyle() const { return m_exStyle; }
inline wxInt32 GetResourceStyle() const { return m_exStyle; }
protected:
wxList m_children;