From d422d01eec769f5339087b4b3ad352d3d164bf1b Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Fri, 6 Aug 1999 10:10:10 +0000
Subject: [PATCH] Distrib things, Typos in dynarray.h, Removed C++
comments from code, Added a few #ifdef wxUSE_XXX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
docs/gtk/changes.txt | 6 ++++--
docs/html/news.htm | 27 ++++++++++++++++++++++++++-
include/wx/dynarray.h | 4 ++--
include/wx/gsocket.h | 12 +++++++++---
include/wx/spinbutt.h | 5 +++++
src/gtk/gsockgtk.c | 6 +++---
src/gtk1/gsockgtk.c | 6 +++---
src/unix/gsocket.c | 5 +++--
src/unix/gsockunx.h | 19 ++++++++++++++++++-
9 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 9212a4d8d3..85946c0d92 100644
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,5 +1,5 @@
-29th July '99: Eight wxGTK 2.1 snapshot released
+6th August '99: Eight wxGTK 2.1 snapshot released
The new makefile system is not able to produce shared libraries
on Unix with the exception of Linux - libtool is really great.
@@ -36,10 +36,12 @@ wxFilesystem, wxHTMLHelpController and others.
Added a wrapper for ffile() etc functions.
-Updateds to wxDynamicLibrary.
+Updates to wxDynamicLibrary.
New documentation.
+New version of wxPython, of course.
+
Fixed in unenclosed number of other bugs...
25th June '99: Seventh wxGTK 2.1 snapshot released
diff --git a/docs/html/news.htm b/docs/html/news.htm
index 49e1aa47db..a085388f3d 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,9 +18,34 @@ News
</tr>
</table>
+<H3>August 6th, 1999</H3><P>
+
+Today, a snapshot release of the MSW and the GTK ports has been
+made. The two snapshots are synchronized and have been tested
+for several weeks and should thus be considered to be quite stable.
+
+Among the many new features that have appeared since version 2.0
+was release are:
+
+<ul>
+<li> A great number of incompatiblities between the GTK and the MSW port have been removed. This
+holds escecially true for the way, time and order, controls send notifications to the user program.
+<li> Practically all widgets have been updated, removing bugs or adding missing features to
+specific ports (mostly the GTK port).
+<li> The GTK port now supports GTK version 1.2 as well as 1.0, giving access to the many new
+features, such as e.g. menu accelerators.
+<li> Many of the non-GUI classes have been reworked and new ones added, the stream classes
+having undergone a complete rewrite.
+<li> The addition of code to handle Unicode has begun and is in an advanced state.
+<li> The Python bindings (wxPython) have been largely improved and upadted to the newest
+API and features.
+</ul>
+
+
+
<H3>July 31st, 1999</H3><P>
-We are glad to announce the start of the work on the new wxWindows port - wxBe
+We are glad to announce the start of the work on the new wxWindows port - wxBeOS
which will implement wxWindows 2 API for <A HREF="http://www.be.com">BeOS</A>.
Thanks to Be for donating licenses to wxWindows project to make it possible.
<P>
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 34aaff0a2b..caf4b814d1 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -177,7 +177,7 @@ public: \
{ \
size_t type = sizeof(T); \
size_t sizelong = sizeof(long); \
- if ( type <= sizelong ) \
+ if ( type > sizelong ) \
{ wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); } \
} \
\
@@ -239,7 +239,7 @@ public: \
name(SCMPFUNC##T fn) \
{ size_t type = sizeof(T); \
size_t sizelong = sizeof(long); \
- if ( type <= sizelong ) \
+ if ( type > sizelong ) \
{ wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); } \
m_fnCompare = fn; \
} \
diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 6f606332a9..7190696fd0 100644
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -8,12 +8,14 @@
#ifndef __GSOCKET_H
#define __GSOCKET_H
+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+
#include <sys/types.h>
#if !defined(__cplusplus)
-
typedef int bool;
-
#endif
#ifndef TRUE
@@ -230,7 +232,11 @@ void GSocket_DoEvent(unsigned long evt_id);
#ifdef __cplusplus
};
+#endif /* __cplusplus */
+
+
#endif
+ /* wxUSE_SOCKETS */
#endif
- /* __GSOCKET_H */
+ /* __GSOCKET_H */
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index f28d46ce62..02f38a74b0 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -12,6 +12,11 @@
#ifndef _WX_SPINBUTT_H_BASE_
#define _WX_SPINBUTT_H_BASE_
+#ifdef __GNUG__
+#pragma interface "spinbutbase.h"
+#pragma implementation "spinbutbase.h"
+#endif
+
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c
index e462a6aece..006a04fbf0 100644
--- a/src/gtk/gsockgtk.c
+++ b/src/gtk/gsockgtk.c
@@ -10,9 +10,9 @@
#if wxUSE_SOCKETS
#include <stdlib.h>
-#include <gdk/gdk.h>
-#include <glib.h>
-#include <wx/gsocket.h>
+#include "gdk/gdk.h"
+#include "glib.h"
+#include "wx/gsocket.h"
#include "../unix/gsockunx.h"
void _GSocket_GDK_Input(gpointer data, gint source, GdkInputCondition condition)
diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c
index e462a6aece..006a04fbf0 100644
--- a/src/gtk1/gsockgtk.c
+++ b/src/gtk1/gsockgtk.c
@@ -10,9 +10,9 @@
#if wxUSE_SOCKETS
#include <stdlib.h>
-#include <gdk/gdk.h>
-#include <glib.h>
-#include <wx/gsocket.h>
+#include "gdk/gdk.h"
+#include "glib.h"
+#include "wx/gsocket.h"
#include "../unix/gsockunx.h"
void _GSocket_GDK_Input(gpointer data, gint source, GdkInputCondition condition)
diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 622f5e0681..4255501bd8 100644
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -101,7 +101,7 @@ GSocket *GSocket_new()
socket->m_gui_dependent = NULL;
socket->m_blocking = FALSE;
socket->m_timeout = 10*60*1000;
- // 10 minutes * 60 sec * 1000 millisec
+ /* 10 minutes * 60 sec * 1000 millisec */
/* We initialize the GUI specific entries here */
_GSocket_GUI_Init(socket);
@@ -1150,4 +1150,5 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
return GSOCK_NOERROR;
}
-#endif // wxUSE_SOCKETS
+#endif
+ /* wxUSE_SOCKETS */
diff --git a/src/unix/gsockunx.h b/src/unix/gsockunx.h
index 75a70ceee9..7c0ce9a5a9 100644
--- a/src/unix/gsockunx.h
+++ b/src/unix/gsockunx.h
@@ -8,7 +8,16 @@
#ifndef __GSOCK_UNX_H
#define __GSOCK_UNX_H
-#include <wx/gsocket.h>
+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+
+#include "wx/gsocket.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
/* Definition of GSocket */
struct _GSocket {
@@ -66,4 +75,12 @@ GSocketError _GAddress_Init_INET(GAddress *address);
/* Local address family */
GSocketError _GAddress_Init_UNIX(GAddress *address);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
+ /* wxUSE_SOCKETS */
+
#endif
+ /* __GSOCK_UNX_H */
--
2.47.2