Changeset 249 in Main for trunk/Server

Timestamp:

Oct 4, 2024, 5:59:55 AM (6 weeks ago)

Author:

Nishi

Message:

fix vc6

Location:

trunk/Server

Files:

• Makefile (modified) (2 diffs)
• gui.c (modified) (2 diffs)
• gui.rc (modified) (2 diffs)
• main.c (modified) (1 diff)
• tw_version.h (modified) (1 diff)

trunk/Server/Makefile

@@ -49 +49 @@
         $(WINDRES) tewi.rc -O coff -o $@
 
-tewi_vc6.res: tewi.rc ../Binary/tewi.ico
-        rc /fo$@ tewi.rc
-
 tewi_bcc.res: tewi.rc ../Binary/tewi.ico
         brc32 -r -fo$@ tewi.rc
@@ -58 +55 @@
         $(WINDRES) gui.rc -O coff -o $@
 
-gui_vc6.res: gui.rc gui.h
-        rc /fo$@ gui.rc
-
 gui_bcc.res: gui.rc gui.h
         brc32 -r -fo$@ gui.rc
 
+vc6.res: tewi.rc gui.rc
+        cat tewi.rc gui.rc > concat.rc
+        rc /fo$@ concat.rc
+        rm -f concat.rc
+
 clean:
-        rm -f *.o tewi *.exe *.res *.elf *.sfo *.pbp *.self *.pkg *.obj
+        rm -f *.o tewi *.exe *.res *.elf *.sfo *.pbp *.self *.pkg *.obj concat.rc

trunk/Server/gui.c

@@ -60 +60 @@
                 ShowBitmapSize(hWnd, hdc, "TEWILOGO", size.left, size.top, WINWIDTH(size), WINWIDTH(size));
                 EndPaint(hWnd, &ps);
+        }else if(msg == WM_CTLCOLORDLG || msg == WM_CTLCOLORSTATIC){
+                HDC dc = (HDC)wp;
+                SetBkMode(dc, TRANSPARENT);
+                return GetSysColorBrush(COLOR_MENU);
         }else{
                 return FALSE;
@@ -80 +84 @@
                 if(trig == GUI_BUTTON_ABOUT){
                         if(ev == BN_CLICKED){
-                                DialogBox(hInst, "VERSIONDLG", hWnd, VersionDialog);
+                                DialogBox(hInst, "VERSIONDLG", hWnd, (DLGPROC)VersionDialog);
                         }
                 }else if(trig == GUI_BUTTON_START){

trunk/Server/gui.rc

@@ -5 +5 @@
 #include "tw_version.h"
 
-PBTEWI BITMAP "../Binary/pbtewi.bmp"
+PBTEWI BITMAP "..\\Binary\\pbtewi.bmp"
 TEWILOGO BITMAP "../Binary/tewi.bmp"
 
@@ -12 +12 @@
 CAPTION "Version Information"
 {
-        LTEXT "Tewi HTTPd version " TW_VERSION, GUI_TEWI_NAME, 42, 5, 192, 50
+        LTEXT TW_VERSION_TEXT, GUI_TEWI_NAME, 42, 5, 192, 50
         LTEXT "Original by Nishi <nishi@nishi.boats>", GUI_TEWI_ORIGINAL, 42, 5 + 8, 192, 50
-        LTEXT "Compilation date: " __DATE__ " " __TIME__, GUI_TEWI_DATE, 42, 5 + 8 + 8, 192, 50
         DEFPUSHBUTTON "&OK", IDOK, 75, 35, 50, 10
 }

trunk/Server/main.c

@@ -8 +8 @@
 
 #pragma resource "tewi_bcc.res"
+
 #pragma resource "gui_bcc.res"
 

trunk/Server/tw_version.h

@@ -9 +9 @@
 
 #define TW_VERSION "2.03D\0"
+#define TW_VERSION_TEXT "Tewi HTTPd version 2.03D"
 
 const char* tw_get_version(void);