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

some fixes from the SGI build log

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-24 15:47:21 +00:00
parent b19d5e569e
commit bf3dab485a
7 changed files with 669 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,8 @@ public:
wxDataFormat( const wxChar *id ); wxDataFormat( const wxChar *id );
wxDataFormat( NativeFormat format ); wxDataFormat( NativeFormat format );
wxDataFormat& operator=(const wxDataFormat& format)
{ m_type = format.m_type; m_format = format.m_format; return *this; }
wxDataFormat& operator=(NativeFormat format) wxDataFormat& operator=(NativeFormat format)
{ SetId(format); return *this; } { SetId(format); return *this; }

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

@@ -24,6 +24,8 @@ public:
wxDataFormat( const wxChar *id ); wxDataFormat( const wxChar *id );
wxDataFormat( NativeFormat format ); wxDataFormat( NativeFormat format );
wxDataFormat& operator=(const wxDataFormat& format)
{ m_type = format.m_type; m_format = format.m_format; return *this; }
wxDataFormat& operator=(NativeFormat format) wxDataFormat& operator=(NativeFormat format)
{ SetId(format); return *this; } { SetId(format); return *this; }

1
src/gtk/gsockgtk.c
View File

@@ -33,7 +33,6 @@ void _GSocket_GDK_Input(gpointer data,
void _GSocket_GUI_Init(GSocket *socket) void _GSocket_GUI_Init(GSocket *socket)
{ {
int i;
gint *m_id; gint *m_id;
socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2); socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2);

2
src/gtk/win_gtk.c
View File

@@ -364,7 +364,6 @@ gtk_pizza_set_size (GtkPizza *pizza,
{ {
GtkPizzaChild *child; GtkPizzaChild *child;
GList *children; GList *children;
GtkAllocation child_allocation;
g_return_if_fail (pizza != NULL); g_return_if_fail (pizza != NULL);
g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (GTK_IS_PIZZA (pizza));
@@ -593,7 +592,6 @@ gtk_pizza_size_allocate (GtkWidget *widget,
gint border; gint border;
gint x,y,w,h; gint x,y,w,h;
GtkPizzaChild *child; GtkPizzaChild *child;
GtkAllocation child_allocation;
GList *children; GList *children;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);

1
src/gtk1/gsockgtk.c
View File

@@ -33,7 +33,6 @@ void _GSocket_GDK_Input(gpointer data,
void _GSocket_GUI_Init(GSocket *socket) void _GSocket_GUI_Init(GSocket *socket)
{ {
int i;
gint *m_id; gint *m_id;
socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2); socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2);

2
src/gtk1/win_gtk.c
View File

@@ -364,7 +364,6 @@ gtk_pizza_set_size (GtkPizza *pizza,
{ {
GtkPizzaChild *child; GtkPizzaChild *child;
GList *children; GList *children;
GtkAllocation child_allocation;
g_return_if_fail (pizza != NULL); g_return_if_fail (pizza != NULL);
g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (GTK_IS_PIZZA (pizza));
@@ -593,7 +592,6 @@ gtk_pizza_size_allocate (GtkWidget *widget,
gint border; gint border;
gint x,y,w,h; gint x,y,w,h;
GtkPizzaChild *child; GtkPizzaChild *child;
GtkAllocation child_allocation;
GList *children; GList *children;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);

2
src/makeprog.b32
View File

@@ -13,7 +13,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env !include $(WXDIR)\src\makeb32.env
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg odbc32 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS) LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)