OS/2 Updates

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

include/wx/frame.h

@@ -27,6 +27,7 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern wxWindow*) wxWndHook;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;

include/wx/os2/app.h

@@ -30,6 +30,12 @@ void WXDLLEXPORT wxExit(void);
 // Yield to other apps/messages
 bool WXDLLEXPORT wxYield(void);
 
+extern MRESULT EXPENTRY wxWndProc( HWND
+                                  ,ULONG
+                                  ,MPARAM
+                                  ,MPARAM
+                                 );
+
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase

include/wx/os2/colour.h

@@ -74,6 +74,7 @@ public:
 
     //
     // Accessors
+    //
     bool Ok(void) const {return m_bIsInit; }
 
     //

include/wx/os2/menu.h

@@ -21,6 +21,8 @@
 
 class WXDLLEXPORT wxFrame;
 
+void wxSetShortCutKey(wxChar* zText);
+
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------

src/common/wincmn.cpp

@@ -125,7 +125,8 @@ void wxWindowBase::InitBase()
     m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
 
     // GRG, changed Mar/2000
-#if 0 // !defined(__WXMAC__) && !defined(__WXGTK__)
+#if defined(__VISAGECPP__) && __IBMCPP__ < 0x400
+    // For now VisualAge 3.0 needs it this way
     m_font = *wxSWISS_FONT;         //      and this?
 #else
     m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);