Changed instal path for setup.h
changed socket stream inheritance to virtual removed a few more warnings from the samples corrected thread habdling in configure.in removed dancing sliders from scrollbars corrected notebook send event bug and added it the controls sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -276,6 +276,7 @@ public:
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_isScrolling;
|
||||
bool m_hasOwnStyle;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
|
@@ -276,6 +276,7 @@ public:
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_isScrolling;
|
||||
bool m_hasOwnStyle;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
|
@@ -18,7 +18,7 @@
|
||||
#include "wx/stream.h"
|
||||
#include "wx/socket.h"
|
||||
|
||||
class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
|
||||
class WXDLLEXPORT wxSocketOutputStream : public virtual wxOutputStream
|
||||
{
|
||||
public:
|
||||
wxSocketOutputStream(wxSocketBase& s);
|
||||
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
|
||||
wxSocketBase *m_o_socket;
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxSocketInputStream : public wxInputStream
|
||||
class WXDLLEXPORT wxSocketInputStream : public virtual wxInputStream
|
||||
{
|
||||
public:
|
||||
wxSocketInputStream(wxSocketBase& s);
|
||||
|
Reference in New Issue
Block a user