Changeset 1203 for trunk/gsdl/src/w32server/fnord.cpp

Timestamp:

2000-06-12T14:49:06+12:00 (24 years ago)

Author:

sjboddie

Message:

Made a few minor changes to get the local library compiling under VC++ 6.0
using the built-in STL (i.e. without the GSDL_USE_IOS_H pre-processor
definition set).

File:

• trunk/gsdl/src/w32server/fnord.cpp (modified) (8 diffs)

trunk/gsdl/src/w32server/fnord.cpp

@@ -18 +18 @@
 The author can be contacted via Email at [email protected]
 */
+#include "text_t.h"
 #include <windows.h>
 #include <stdlib.h>
@@ -165 +166 @@
   if (coltitledc == NULL) {
     coltitledc = CreateCompatibleDC(pdc);
-    defcoltitlebitmap = SelectObject (coltitledc, coltitlebitmap);
+    defcoltitlebitmap = (HBITMAP)SelectObject (coltitledc, coltitlebitmap);
   }
   
   if (logodc == NULL) {
     logodc = CreateCompatibleDC(pdc);
-    deflogobitmap = SelectObject (logodc, logobitmap);
+    deflogobitmap = (HBITMAP)SelectObject (logodc, logobitmap);
   }
   
@@ -219 +220 @@
       statusRect.right = STATUSX+STATUSWIDTH;
       statusRect.bottom = STATUSY+STATUSHEIGHT;
-      FillRect(pdc, &statusRect, GetStockObject(WHITE_BRUSH));
+      FillRect(pdc, &statusRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
       
       int cury = STATUSY;
@@ -259 +260 @@
     infoRect.right = INFOX+INFOWIDTH;
     infoRect.bottom = INFOY+INFOHEIGHT;
-    FillRect(pdc, &infoRect, GetStockObject(WHITE_BRUSH));
+    FillRect(pdc, &infoRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
     DrawText(pdc, infostring, -1, &infoRect, DT_CENTER);
   }
@@ -558 +559 @@
     // finally, get the host name (no error value
     // is returned from this function)
-    GetLocalName(Instance);
+    GetLocalName((HINSTANCE)Instance);
     
       } else {
@@ -596 +597 @@
   startbrowserdir[0] = '\0';
   netscapeneeded = 0;
-  int err = tryinitnetwork (Instance, MsgWindow, NULL);
-  //int err = 1;
+  //  int err = tryinitnetwork (Instance, MsgWindow, NULL);
+  int err = 1;
   
   // if an error occurred, try again with billsock
@@ -802 +803 @@
 
 
-int __stdcall WinMain(HANDLE Instance, HANDLE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
+int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
   HWND MainWindow;  MSG Message;  WNDCLASS MainClass;  
   
@@ -813 +814 @@
   MainClass.hIcon     = LoadIcon(Instance, MAKEINTRESOURCE(TRAY_ICON));
   MainClass.hCursor   = LoadCursor(NULL, IDC_ARROW);
-  MainClass.hbrBackground = GetStockObject(WHITE_BRUSH);
+  MainClass.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
   MainClass.lpszMenuName = MAKEINTRESOURCE(Main_Menu);
   MainClass.lpszClassName = "Greenstone Digital Library Software";