Mercurial > dwindows

changeset 511:80dbd5a1f403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the increments parameter from dw_scrollbar_new().
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 09 Mar 2004 03:54:21 +0000
parents 710f82598210
children 8eb10e610270
files dw.h gtk/dw.c mac/dw.c makefile.emx os2/dw.c win/dw.c
diffstat 6 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dw.h	Tue Mar 09 03:27:39 2004 +0000
+++ b/dw.h	Tue Mar 09 03:54:21 2004 +0000
@@ -918,7 +918,7 @@
 HWND API dw_radiobutton_new(char *text, ULONG id);
 HWND API dw_percent_new(unsigned long id);
 HWND API dw_slider_new(int vertical, int increments, ULONG id);
-HWND API dw_scrollbar_new(int vertical, int increments, ULONG id);
+HWND API dw_scrollbar_new(int vertical, ULONG id);
 HWND API dw_checkbox_new(char *text, unsigned long id);
 HWND API dw_listbox_new(unsigned long id, int multi);
 void API dw_listbox_append(HWND handle, char *text);
--- a/gtk/dw.c	Tue Mar 09 03:27:39 2004 +0000
+++ b/gtk/dw.c	Tue Mar 09 03:54:21 2004 +0000
@@ -2750,14 +2750,14 @@
  *       increments: Number of increments available.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-HWND dw_scrollbar_new(int vertical, int increments, ULONG id)
+HWND dw_scrollbar_new(int vertical, ULONG id)
 {
 	GtkWidget *tmp;
 	GtkAdjustment *adjustment;
 	int _locked_by_me = FALSE;
 
 	DW_MUTEX_LOCK;
-	adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1);
+	adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1);
 	if(vertical)
 		tmp = gtk_vscrollbar_new(adjustment);
 	else
--- a/mac/dw.c	Tue Mar 09 03:27:39 2004 +0000
+++ b/mac/dw.c	Tue Mar 09 03:54:21 2004 +0000
@@ -1310,7 +1310,7 @@
  *       increments: Number of increments available.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-HWND API dw_scrollbar_new(int vertical, int increments, ULONG id)
+HWND API dw_scrollbar_new(int vertical, ULONG id)
 {
 	HWND hwnd;
 	CreateScrollBarControl(CreationWindow, &CreationRect, 0, 0, increments, increments, FALSE, 0, &hwnd);
--- a/makefile.emx	Tue Mar 09 03:27:39 2004 +0000
+++ b/makefile.emx	Tue Mar 09 03:54:21 2004 +0000
@@ -16,7 +16,7 @@
 RCFLAGS = -r
 
 
-COMPATOBJECTS = compat.obj dirent.obj
+COMPATOBJECTS = compat.o dirent.o
 COMPATSOURCES = compat.c dirent.c
 
 all: dw.dll dwcompat.dll dwtest.exe
@@ -37,21 +37,21 @@
 	copy dwcompat.dll dll
 	copy dwcompat.lib lib
 
-dwtest.exe: dwtest.obj dw.lib dwcompat.lib
-	$(CC) $(CFLAGS) -Zcrtdll -Zomf -Zmt -o dwtest.exe dwtest.obj -Llib -ldw -ldwcompat dwtest.def
+dwtest.exe: dwtest.o dw.lib dwcompat.lib
+	$(CC) $(CFLAGS) -Zcrtdll -Zomf -Zmt -o dwtest.exe dwtest.o -Llib -ldw -ldwcompat dwtest.def
 
 clean: 
 	$(RM) $(OBJECTS) dwtest.exe
 
-dw.obj: dw.c
+dw.o: dw.c
 	$(CC) $(CFLAGS) -c $<	
 
-compat.obj: compat.c
+compat.o: compat.c
 	$(CC) $(CFLAGS) -c $<	
 
-dirent.obj: os2/dirent.c
+dirent.o: os2/dirent.c
 	$(CC) $(CFLAGS) -c $<	
 
-dwtest.obj: dwtest.c
+dwtest.o: dwtest.c
 	$(CC) $(CFLAGS) -c $<	
 
--- a/os2/dw.c	Tue Mar 09 03:27:39 2004 +0000
+++ b/os2/dw.c	Tue Mar 09 03:54:21 2004 +0000
@@ -4739,9 +4739,8 @@
  *       increments: Number of increments available.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-HWND API dw_scrollbar_new(int vertical, int increments, ULONG id)
-{
-	increments = increments; /* keep compiler happy */
+HWND API dw_scrollbar_new(int vertical, ULONG id)
+{
 	return WinCreateWindow(HWND_OBJECT,
 						   WC_SCROLLBAR,
 						   "",
--- a/win/dw.c	Tue Mar 09 03:27:39 2004 +0000
+++ b/win/dw.c	Tue Mar 09 03:54:21 2004 +0000
@@ -4659,7 +4659,7 @@
  *       increments: Number of increments available.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-HWND API dw_scrollbar_new(int vertical, int increments, ULONG id)
+HWND API dw_scrollbar_new(int vertical, ULONG id)
 {
 	HWND tmp = CreateWindow(SCROLLBARCLASSNAME,
 							"",