Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
to wxWindow, GnuWin32 fix in registry.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-13 10:19:16 +00:00
parent 088a95f5ff
commit 14b72bf5a6
6 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@@ -873,7 +873,11 @@ typedef unsigned long WXHCONV;
typedef void * WXDRAWITEMSTRUCT; typedef void * WXDRAWITEMSTRUCT;
typedef void * WXMEASUREITEMSTRUCT; typedef void * WXMEASUREITEMSTRUCT;
typedef void * WXLPCREATESTRUCT; typedef void * WXLPCREATESTRUCT;
#ifdef __GNUWIN32__
typedef int (*WXFARPROC)();
#else
typedef int (__stdcall *WXFARPROC)(); typedef int (__stdcall *WXFARPROC)();
#endif
#endif #endif

3
include/wx/msw/frame.h
View File

@@ -129,8 +129,6 @@ public:
virtual void Maximize(bool maximize); virtual void Maximize(bool maximize);
// virtual bool LoadAccelerators(const wxString& table); // virtual bool LoadAccelerators(const wxString& table);
virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
// Responds to colour changes // Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -166,7 +164,6 @@ protected:
WXHICON m_defaultIcon; WXHICON m_defaultIcon;
static bool m_useNativeStatusBar; static bool m_useNativeStatusBar;
wxToolBar * m_frameToolBar ; wxToolBar * m_frameToolBar ;
wxAcceleratorTable m_acceleratorTable;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

BIN
include/wx/msw/magnif1.cur
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

8
include/wx/msw/registry.h
View File

@@ -121,10 +121,18 @@ public:
// return true if the key exists // return true if the key exists
bool Exists() const; bool Exists() const;
// get the info about key (any number of these pointers may be NULL) // 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 bool GetKeyInfo(ulong *pnSubKeys, // number of subkeys
ulong *pnMaxKeyLen, // max len of subkey name ulong *pnMaxKeyLen, // max len of subkey name
ulong *pnValues, // number of values ulong *pnValues, // number of values
ulong *pnMaxValueLen) const; ulong *pnMaxValueLen) const;
#endif
// return true if the key is opened // return true if the key is opened
bool IsOpened() const { return m_hKey != 0; } bool IsOpened() const { return m_hKey != 0; }
// for "if ( !key ) wxLogError(...)" kind of expressions // for "if ( !key ) wxLogError(...)" kind of expressions

2
include/wx/msw/tbar95.h
View File

@@ -70,6 +70,8 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
wxSize GetMaxSize(void) const; wxSize GetMaxSize(void) const;
void GetSize(int *w, int *y) const; void GetSize(int *w, int *y) const;
virtual bool GetToolState(int toolIndex) const;
// Add all the buttons: required for Win95. // Add all the buttons: required for Win95.
virtual bool CreateTools(void); virtual bool CreateTools(void);
virtual void SetRows(int nRows); virtual void SetRows(int nRows);

4
include/wx/msw/window.h
View File

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