Mutiple updates from SciTech for wxWindows including the following:

1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


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

include/wx/os2/app.h

@@ -12,6 +12,13 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
+#ifdef __WATCOMC__
+
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#else
+
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -24,6 +31,8 @@
 #define INCL_ORDERS
 #endif
 
+#endif
+
 #include "wx/event.h"
 #include "wx/icon.h"
 

include/wx/os2/colour.h

@@ -35,6 +35,8 @@ public:
              ,unsigned char cBlue
             );
 
+    wxColour( unsigned long colRGB ) { Set(colRGB); }
+
     //
     // Implicit conversion from the colour name
     //

include/wx/os2/dialog.h

@@ -41,6 +41,7 @@ public:
     {
         long                        lModalStyle = lStyle ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
 
+        bModal = false;
         Create( pParent
                ,-1
                ,rsTitle

include/wx/os2/font.h

@@ -43,19 +43,7 @@ public:
         (void)Create(nSize, nFamily, nStyle, nWeight, bUnderlined, rsFace, vEncoding);
     }
 
-    wxFont(const wxNativeFontInfo& rInfo)
-    {
-        Init();
-
-        (void)Create( rInfo.pointSize
-                     ,rInfo.family
-                     ,rInfo.style
-                     ,rInfo.weight
-                     ,rInfo.underlined
-                     ,rInfo.faceName
-                     ,rInfo.encoding
-                    );
-    }
+    wxFont(const wxNativeFontInfo& rInfo);
 
     bool Create( int             nSize
                 ,int             nFamily

include/wx/os2/frame.h

@@ -53,7 +53,9 @@ public:
     virtual void Iconize(bool bIconize = TRUE);
     virtual bool IsIconized(void) const;
     virtual void Restore(void);
+#if wxUSE_MENUS_NATIVE
     virtual void SetMenuBar(wxMenuBar* pMenubar);
+#endif
     virtual void SetIcon(const wxIcon& rIcon);
     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
@@ -175,10 +177,9 @@ protected:
                                  ,int nWeight
                                 );
 
+#if wxUSE_MENUS_NATIVE
     // helper
     void         DetachMenuBar(void);
-
-#if wxUSE_MENUS_NATIVE
     // perform MSW-specific action when menubar is changed
     virtual void AttachMenuBar(wxMenuBar* pMenubar);
     // a plug in for MDI frame classes which need to do something special when

include/wx/os2/notebook.h

@@ -28,7 +28,6 @@ class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 
 // array of notebook pages
-typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayNBPages);
 
 // ----------------------------------------------------------------------------

include/wx/os2/region.h

@@ -45,7 +45,7 @@ public:
              ,const wxPoint& rBottomRight
             );
     wxRegion(const wxRect& rRect);
-    wxRegion(WXHRGN hRegion); // Hangs on to this region
+    wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region
 
     wxRegion();
     ~wxRegion();

include/wx/os2/window.h

@@ -109,10 +109,12 @@ public:
                                    ,int*            pExternalLeading = (int *)NULL
                                    ,const wxFont*   pTheFont = (const wxFont *)NULL
                                   ) const;
+#if wxUSE_MENUS_NATIVE
     virtual bool     DoPopupMenu( wxMenu* pMenu
                                  ,int     nX
                                  ,int     nY
                                 );
+#endif // wxUSE_MENUS_NATIVE
 
     virtual void     SetScrollbar( int  nOrient
                                   ,int  nPos
@@ -180,6 +182,7 @@ public:
                     ) const;
 #endif // wxUSE_CARET
 
+#ifndef __WXUNIVERSAL__
     // Native resource loading (implemented in src/os2/nativdlg.cpp)
     // FIXME: should they really be all virtual?
     virtual bool LoadNativeDialog( wxWindow*   pParent
@@ -190,6 +193,7 @@ public:
                                  );
     wxWindow*    GetWindowChild1(wxWindowID vId);
     wxWindow*    GetWindowChild(wxWindowID vId);
+#endif //__WXUNIVERSAL__
 
     // implementation from now on
     // --------------------------
@@ -266,6 +270,7 @@ public:
                                    ) const;
 #endif // WXWIN_COMPATIBILITY
 
+#ifndef __WXUNIVERSAL__
     // Create an appropriate wxWindow from a HWND
     virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent
                                            ,WXHWND    hWnd
@@ -273,6 +278,7 @@ public:
 
     // Make sure the window style reflects the HWND style (roughly)
     virtual void AdoptAttributesFromHWND(void);
+#endif
 
     // Setup background and foreground colours correctly
     virtual void SetupColours(void);