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

Some wxUniv compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-06-29 17:07:54 +00:00
parent a5b3669d76
commit 24ce4c1875
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/univ/frame.h
View File

@@ -20,6 +20,14 @@
// wxFrame // wxFrame
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXMSW__)
#define wxFrameNative wxFrameMSW
#elif defined(__WXGTK__)
#define wxFrameNative wxFrameGTK
#elif defined(__WXMGL__)
#define wxFrameNative wxFrameMGL
#endif
class wxFrame : public wxFrameNative class wxFrame : public wxFrameNative
{ {
public: public:

3
include/wx/univ/setup.h
View File

@@ -38,7 +38,7 @@
#define wxUSE_TIMER 1 #define wxUSE_TIMER 1
#define wxUSE_STOPWATCH 1 #define wxUSE_STOPWATCH 1
#define wxUSE_TIMEDATE 0 #define wxUSE_TIMEDATE 0
#define wxUSE_DATETIME 0 #define wxUSE_DATETIME 1
#define wxUSE_CONFIG 0 #define wxUSE_CONFIG 0
#define wxUSE_CONFIG_NATIVE 0 #define wxUSE_CONFIG_NATIVE 0
#define wxUSE_DIALUP_MANAGER 0 #define wxUSE_DIALUP_MANAGER 0
@@ -66,6 +66,7 @@
#define wxUSE_NOTEBOOK 1 #define wxUSE_NOTEBOOK 1
#define wxUSE_FONTMAP 0 #define wxUSE_FONTMAP 0
#define wxUSE_MIMETYPE 0 #define wxUSE_MIMETYPE 0
#define wxUSE_IMAGE 1
#define wxUSE_CONTROLS 1 #define wxUSE_CONTROLS 1
#define wxUSE_POPUPWIN 1 #define wxUSE_POPUPWIN 1

8
include/wx/univ/window.h
View File

@@ -55,6 +55,14 @@ enum
// wxWindow // wxWindow
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXMSW__)
#define wxWindowNative wxWindowMSW
#elif defined(__WXGTK__)
#define wxWindowNative wxWindowGTK
#elif defined(__WXMGL__)
#define wxWindowNative wxWindowMGL
#endif
class WXDLLEXPORT wxWindow : public wxWindowNative class WXDLLEXPORT wxWindow : public wxWindowNative
{ {
public: public:

2
src/generic/scrolwin.cpp
View File

@@ -242,7 +242,9 @@ wxScrollHelper::wxScrollHelper(wxWindow *win)
m_scaleX = m_scaleX =
m_scaleY = 1.0; m_scaleY = 1.0;
#if wxUSE_MOUSEWHEEL
m_wheelRotation = 0; m_wheelRotation = 0;
#endif
m_win = m_win =
m_targetWindow = (wxWindow *)NULL; m_targetWindow = (wxWindow *)NULL;

8
src/msw/window.cpp
View File

@@ -2415,7 +2415,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
// Don't yet process menu help events, just windows // Don't yet process menu help events, just windows
if (info->iContextType == HELPINFO_WINDOW) if (info->iContextType == HELPINFO_WINDOW)
{ {
wxWindow* subjectOfHelp = this; wxWindowMSW* subjectOfHelp = this;
bool eventProcessed = FALSE; bool eventProcessed = FALSE;
while (subjectOfHelp && !eventProcessed) while (subjectOfHelp && !eventProcessed)
{ {
@@ -3526,7 +3526,7 @@ bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
return GetEventHandler()->ProcessEvent(event); return GetEventHandler()->ProcessEvent(event);
} }
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL && !defined(__WXUNIVERSAL__)
else else
{ {
// the text ctrl which is logically part of wxSpinCtrl sends WM_COMMAND // the text ctrl which is logically part of wxSpinCtrl sends WM_COMMAND
@@ -3651,7 +3651,7 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
} }
bool wxWindow::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam) bool wxWindowMSW::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)
{ {
#if wxUSE_MOUSEWHEEL #if wxUSE_MOUSEWHEEL
wxMouseEvent event(wxEVT_MOUSEWHEEL); wxMouseEvent event(wxEVT_MOUSEWHEEL);
@@ -4224,7 +4224,7 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)
// spin control text buddy window should be mapped to spin ctrl // spin control text buddy window should be mapped to spin ctrl
// itself so try it too // itself so try it too
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL && !defined(__WXUNIVERSAL__)
if ( !win ) if ( !win )
{ {
win = wxSpinCtrl::GetSpinForTextCtrl((WXHWND)hwnd); win = wxSpinCtrl::GetSpinForTextCtrl((WXHWND)hwnd);