Attempting to check in this wretched cursor again. Also added SetAcceleratorTable

to wxWindow, GnuWin32 fix in registry.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f5bfc86b809389ba516d2a098b6f682042565c9f..092b883901aa1b11678fc64561303586722c32b7 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -873,7 +873,11 @@ typedef unsigned long   WXHCONV;
 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
+#ifdef __GNUWIN32__
+typedef int (*WXFARPROC)();
+#else
 typedef int (__stdcall *WXFARPROC)();
+#endif
 
 #endif
 

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index cb9baa3d64081d7f67767db7a69aae5fc85dc419..8735c243b8201d5f8731f420a446f057c0fa8ba7 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -129,8 +129,6 @@ public:
   virtual void Maximize(bool maximize);
 //  virtual bool LoadAccelerators(const wxString& table);
 
-  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
-
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
@@ -166,7 +164,6 @@ protected:
   WXHICON               m_defaultIcon;
   static bool           m_useNativeStatusBar;
   wxToolBar *           m_frameToolBar ;
-  wxAcceleratorTable    m_acceleratorTable;
 
   DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/msw/magnif1.cur b/include/wx/msw/magnif1.cur
index 6b042d3564490cf26396fa94e8605a6897f30b55..bb4c8978d6ff06cf471120492e33ef0ec3aa5a9b 100644 (file)
Binary files a/include/wx/msw/magnif1.cur and b/include/wx/msw/magnif1.cur differ

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 1d831982c5dde5aea301881848ae0da1bad1cca9..02b49182e6760d0486b928d87b85c0eb71ec91e3 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -121,10 +121,18 @@ public:
     // return true if the key exists
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
+
+#ifdef __GNUWIN32__
+  bool  GetKeyInfo(uint *pnSubKeys,      // number of subkeys
+                   uint *pnMaxKeyLen,    // max len of subkey name
+                   uint *pnValues,       // number of values
+                   uint *pnMaxValueLen) const;
+#else
   bool  GetKeyInfo(ulong *pnSubKeys,      // number of subkeys
                    ulong *pnMaxKeyLen,    // max len of subkey name
                    ulong *pnValues,       // number of values
                    ulong *pnMaxValueLen) const;
+#endif
     // return true if the key is opened
   bool  IsOpened() const { return m_hKey != 0; }
     // for "if ( !key ) wxLogError(...)" kind of expressions

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 404e21f0fc9ff7d897d9ea6bf1c3e1d9a0941316..2b9e0e2b45943c39e9d119048a76219339b9ecda 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -70,6 +70,8 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   wxSize GetMaxSize(void) const;
   void GetSize(int *w, int *y) const;
 
+  virtual bool GetToolState(int toolIndex) const;
+
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);
   virtual void SetRows(int nRows);

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 75d17676f09028a4ec74ca1c636296b50aecf974..716be466069ab46273e1cefc625e4b12382c8bb6 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -26,6 +26,7 @@
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/region.h"
+#include "wx/msw/accel.h"
 
 #define wxKEY_SHIFT     1
 #define wxKEY_CTRL      2
@@ -348,6 +349,8 @@ public:
   inline virtual wxButton *GetDefaultItem(void) const;
   inline virtual void SetDefaultItem(wxButton *but);
 
+  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
+
   // Override to define new behaviour for default action (e.g. double clicking
   // on a listbox)
   virtual void OnDefaultAction(wxControl *initiatingItem);
@@ -588,6 +591,7 @@ public:
   ////////////////////////////////////////////////////////////////////////
   //// PROTECTED DATA
 protected:
+  wxAcceleratorTable    m_acceleratorTable;
   int                   m_windowId;
   long                  m_windowStyle;                         // Store the window's style
   wxEvtHandler *        m_windowEventHandler;  // Usually is 'this'