Changeset 20397

Timestamp:

06/30/07 07:09:06 (1 year ago)

Author:

patrick

Message:

When looking up the Gadgeteer DLL to get the icon for the window, factor in
that the DLL is versioned.

Files:

• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowWin32.cpp (modified) (2 diffs)

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowWin32.cpp

@@ -36 +36 @@
-#include <gadget/Util/Debug.h>
-#include <gadget/InputManager.h>
+#include <gadget/gadgetParam.h>
-#include <gadget/Devices/KeyboardMouseDevice/InputWindowWin32.h>
+
+// The following is used below in InputWindowWin32::MenuInit(). The key parts
+// are GADGET_LIB_RT_OPT and GADGET_VERSION_STR.
+#  if defined(GADGET_DEBUG)
+#     if defined(_DEBUG)
+#        define GADGET_LIB_RT_OPT "_d"
+#     else
+#        define GADGET_LIB_RT_OPT "_g"
+#     endif
+#  else
+#     define GADGET_LIB_RT_OPT ""
+#  endif
+
+#  define GADGET_STRINGIZE(X) GADGET_DO_STRINGIZE(X)
+#  define GADGET_DO_STRINGIZE(X) #X
+#  define GADGET_VERSION_STR GADGET_STRINGIZE(__GADGET_MAJOR__) "_" \
+                             GADGET_STRINGIZE(__GADGET_MINOR__) "_" \
+                             GADGET_STRINGIZE(__GADGET_PATCH__)
-
-
@@ -283 +302 @@
-   pWndClass->lpszClassName = ("Gadgeteer Event Window");
-
-#if defined(GADGET_DEBUG)
-#  if defined(_DEBUG)
-#     define LIBNAME "gadget_d.dll"
-#  else
-#     define LIBNAME "gadget_g.dll"
-#  endif
-#else
-#  define LIBNAME "gadget.dll"
-#endif
-
-   if (pWndClass->hIcon == NULL)
-   {
-
+
+
-      if (hDLLInstance != NULL)
-      {