Fixed wxMSW arrow key bug, changed wxPoem window to a wxWindow

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

src/motif/mdi.cpp

@@ -133,7 +133,7 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height) const
 {
-    return wxWindow::GetClientSize(width. height);
+    wxWindow::GetClientSize(width, height);
 }
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
@@ -240,12 +240,12 @@ void wxMDIParentFrame::DoSetSize(int x, int y,
                                  int width, int height,
                                  int sizeFlags)
 {
-    return wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
 }
 
 void wxMDIParentFrame::DoSetClientSize(int width, int height)
 {
-    return wxWindow::DoSetClientSize(width, height);
+    wxWindow::DoSetClientSize(width, height);
 }
 
 // Responds to colour changes, and passes event on to children.

src/motif/utilsexc.cpp

@@ -98,7 +98,7 @@ void xt_notify_end_process(XtPointer client, int *fid,
     /* wait4 is not part of any standard, use at own risk
     * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
     * --- offer@sgi.com */
-#if !defined(__sgi) && !defined(__SGI__) && !defined(__ALPHA__) && !defined(__SUNCC__)
+#if !defined(__HPUX__) && !defined(__sgi) && !defined(__SGI__) && !defined(__ALPHA__) && !defined(__SUNCC__)
     wait4(process_data->pid, NULL, 0, NULL);
 #else
     wait3((int *) NULL, 0, (rusage *) NULL);

src/motif/window.cpp

@@ -86,6 +86,7 @@ END_EVENT_TABLE()
 wxWindow::wxWindow()
 {
     // Generic
+    m_isWindow = TRUE; // An optimization
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;
@@ -265,6 +266,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                       const wxString& name)
 {
     // Generic
+    m_isWindow = TRUE; // An optimization
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;

src/msw/makefile.vc

@@ -25,10 +25,10 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
-# Please set these according to the settings in wx_setup.h, so we can include
+# Please set these according to the settings in setup.h, so we can include
 # the appropriate libraries in wx.lib
 
-# This one overrides the others, to be consistent with the settings in wx_setup.h
+# This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
 PERIPH_LIBS=
@@ -356,10 +356,14 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
 
 # If taking wxWindows from CVS, setup.h doesn't exist yet.
-$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
-    cd "$(WXDIR)"\include\wx\msw
-    if not exist setup.h copy setup0.h setup.h
-    cd "$(WXDIR)"\src\msw
+# Actually the 'if not exist setup.h' test doesn't work
+# (copies the file anyway)
+# we'll have to comment this rule out.
+
+#$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
+#    cd "$(WXDIR)"\include\wx\msw
+#    if not exist setup.h copy setup0.h setup.h
+#    cd "$(WXDIR)"\src\msw
 
 ..\common\$D\extended.obj:     ..\common\extended.c
         cl @<<

src/msw/window.cpp

@@ -1254,12 +1254,8 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             case VK_DOWN:
             case VK_UP:
             {
-/*
-//            if ( ::GetKeyState(VK_CONTROL) & 0x100 ) // Don't understand purpose of this test
-                if (!MSWOnChar((WORD)wParam, lParam))
-                    return Default();
-*/
-              break;
+                return Default();
+                break;
             }
             default:
                 if (!MSWOnChar((WORD)wParam, lParam))

src/stubs/window.cpp

@@ -59,6 +59,7 @@ END_EVENT_TABLE()
 wxWindow::wxWindow()
 {
     // Generic
+    m_isWindow = TRUE; // An optimization
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;
@@ -146,6 +147,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     // Generic
+    m_isWindow = TRUE; // An optimization
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;