* Added wxSerial DLL support for Borland 32

* zstream.h doesn't anymore include zlib.h
* updated static data
* made wxClassInfo::GetFirst() static
* added user/password support in the URL parser
* fixed bugs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-09-17 17:30:13 +00:00
parent 46ccb5107f
commit 856d2e527d
19 changed files with 345 additions and 95 deletions

View File

@@ -39,7 +39,7 @@ class wxLibrary: public wxObject {
void MergeWithSystem();
protected:
void PrepareClasses(wxClassInfo **first);
void PrepareClasses(wxClassInfo *first);
};
// ---------------------------------------------------------------------------
@@ -65,9 +65,9 @@ extern wxLibraries wxTheLibraries;
// Interesting defines
#define WXDLL_ENTRY_FUNCTION() \
extern "C" wxClassInfo **wxGetClassFirst(); \
wxClassInfo **wxGetClassFirst() { \
return &wxClassInfo::first; \
extern "C" wxClassInfo *wxGetClassFirst(); \
wxClassInfo *wxGetClassFirst() { \
return wxClassInfo::GetFirst(); \
}
#endif

View File

@@ -57,7 +57,7 @@ class WXDLLEXPORT wxClassInfo
inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
inline int GetSize(void) const { return m_objectSize; }
inline wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; }
inline wxClassInfo* GetFirst() const { return sm_first; }
static inline wxClassInfo* GetFirst() { return sm_first; }
inline wxClassInfo* GetNext() const { return m_next; }
bool IsKindOf(wxClassInfo *info) const;

View File

@@ -42,6 +42,7 @@ protected:
wxHTTP m_proxy;
wxURLError m_error;
wxString m_protoname, m_hostname, m_servname, m_path, m_url;
wxString m_user, m_password;
bool PrepProto(wxString& url);
bool PrepHost(wxString& url);

View File

@@ -16,7 +16,6 @@
#endif
#include <wx/stream.h>
#include "../zlib/zlib.h" // don't change this, Robert
class wxZlibInputStream: public wxFilterInputStream {
public:
@@ -33,7 +32,7 @@ class wxZlibInputStream: public wxFilterInputStream {
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
struct z_stream_s m_inflate;
struct z_stream_s *m_inflate;
};
class wxZlibOutputStream: public wxFilterOutputStream {
@@ -53,7 +52,7 @@ class wxZlibOutputStream: public wxFilterOutputStream {
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
struct z_stream_s m_deflate;
struct z_stream_s *m_deflate;
};
#endif