Use solver to check for problems and produce a list of package transactions

[cygwin-apps/setup.git] / proppage.h

diff --git a/proppage.h b/proppage.h
index 1fa39bdc9ade55af4b0135f03a3f0fa71996a385..9424ffc21a4a05ac9de0e3343c8ec633c61d6ad3 100644 (file)
--- a/proppage.h
+++ b/proppage.h
@@ -25,7 +25,6 @@
 #include <prsht.h>
 
 #include "window.h"
-#include "String++.h"
 #include "ControlAdjuster.h"
 
 class PropSheet;
@@ -43,10 +42,10 @@ class PropertyPage:public Window
   // For setting the back/finish buttons properly.
   bool IsFirst, IsLast;
   
-  static BOOL CALLBACK FirstDialogProcReflector (HWND hwnd, UINT message,
+  static INT_PTR CALLBACK FirstDialogProcReflector (HWND hwnd, UINT message,
                                                 WPARAM wParam,
                                                 LPARAM lParam);
-  static BOOL CALLBACK DialogProcReflector (HWND hwnd, UINT message,
+  static INT_PTR CALLBACK DialogProcReflector (HWND hwnd, UINT message,
                                            WPARAM wParam, LPARAM lParam);
   void setTitleFont ();
 
@@ -56,7 +55,7 @@ class PropertyPage:public Window
   typedef struct
     {
       // the URL to load when clicked
-      String url;             
+      std::string url;             
 
       // location of the control's original winproc that we are subclassing
       WNDPROC origWinProc;
@@ -79,8 +78,12 @@ class PropertyPage:public Window
 protected:
     SizeProcessor sizeProcessor;
   
-    virtual BOOL CALLBACK DialogProc (UINT message, WPARAM wParam,
-                                     LPARAM lParam);
+    virtual INT_PTR CALLBACK DialogProc (UINT message, WPARAM wParam,
+                                        LPARAM lParam);
+    virtual INT_PTR CALLBACK OnMouseWheel (UINT message, WPARAM wParam,
+                                          LPARAM lParam);
+    virtual INT_PTR CALLBACK OnTimerMessage (UINT message, WPARAM wParam,
+                                            LPARAM lparam);
 
 public:
     PropertyPage ();
@@ -160,7 +163,7 @@ public:
     return OurSheet;
   };
   
-  void makeClickable (int id, String URL);
+  void makeClickable (int id, std::string link);
 };
 
 #endif /* SETUP_PROPPAGE_H */