Some wxUniv compile fixes

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 35a04ee61b6c5c33ca097b6afa905c4f446670da..349462b295eb1f36b920b44d0aa11032a4c0038b 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -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
 {
 public:
 class wxFrame : public wxFrameNative
 {
 public:

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 3b65f797092e668f2b189a39d5fc11e2c13e79d0..0f893e3c7582aa164dd27aaa0e25753c597e6c0d 100644 (file)
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -38,7 +38,7 @@
 #define wxUSE_TIMER      1
 #define wxUSE_STOPWATCH  1
 #define wxUSE_TIMEDATE      0
 #define wxUSE_TIMER      1
 #define wxUSE_STOPWATCH  1
 #define wxUSE_TIMEDATE      0

-#define wxUSE_DATETIME      0
+#define wxUSE_DATETIME      1

 #define wxUSE_CONFIG           0
 #define wxUSE_CONFIG_NATIVE   0
 #define wxUSE_DIALUP_MANAGER   0
 #define wxUSE_CONFIG           0
 #define wxUSE_CONFIG_NATIVE   0
 #define wxUSE_DIALUP_MANAGER   0


@@ -66,6 +66,7 @@
 #define wxUSE_NOTEBOOK 1
 #define wxUSE_FONTMAP 0
 #define wxUSE_MIMETYPE 0
 #define wxUSE_NOTEBOOK 1
 #define wxUSE_FONTMAP 0
 #define wxUSE_MIMETYPE 0

+#define wxUSE_IMAGE        1

 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 4af5b3fb228c8426298fab74cc1e94101b7037f9..ba2828e06f36f07a0b2eedcf197fcb7a8f41f767 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -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
 {
 public:
 class WXDLLEXPORT wxWindow : public wxWindowNative
 {
 public:

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 991029613dd80ccd098c7a864381d17336fb9693..e12edf05c9c7623254cb9e96e173e5ff1e9fe04e 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -242,7 +242,9 @@ wxScrollHelper::wxScrollHelper(wxWindow *win)
 
     m_scaleX =
     m_scaleY = 1.0;
 
     m_scaleX =
     m_scaleY = 1.0;

+#if wxUSE_MOUSEWHEEL

     m_wheelRotation = 0;
     m_wheelRotation = 0;

+#endif

 
     m_win =
     m_targetWindow = (wxWindow *)NULL;
 
     m_win =
     m_targetWindow = (wxWindow *)NULL;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 91191899b5168046947a8532eb541b7b3291a93b..316917aafbd3b5e6243af6cc74991016c0e5cbb0 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2415,7 +2415,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                 // Don't yet process menu help events, just windows
                 if (info->iContextType == HELPINFO_WINDOW)
                 {
                 // Don't yet process menu help events, just windows
                 if (info->iContextType == HELPINFO_WINDOW)
                 {

-                    wxWindow* subjectOfHelp = this;
+                    wxWindowMSW* subjectOfHelp = this;

                     bool eventProcessed = FALSE;
                     while (subjectOfHelp && !eventProcessed)
                     {
                     bool eventProcessed = FALSE;
                     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
     {
         // the text ctrl which is logically part of wxSpinCtrl sends WM_COMMAND
     else
     {
         // 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
     wxMouseEvent event(wxEVT_MOUSEWHEEL);
 {
 #if wxUSE_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
             // itself so try it too
 
             // spin control text buddy window should be mapped to spin ctrl
             // itself so try it too

-#if wxUSE_SPINCTRL
+#if wxUSE_SPINCTRL && !defined(__WXUNIVERSAL__)

             if ( !win )
             {
                 win = wxSpinCtrl::GetSpinForTextCtrl((WXHWND)hwnd);
             if ( !win )
             {
                 win = wxSpinCtrl::GetSpinForTextCtrl((WXHWND)hwnd);