OS/2 Updates

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index d21024cfb23f5070390973b75ae99619cc924a75..3a3c0354a32eff84ea243d94de2e9a5f60a96da9 100644 (file)
--- a/include/wx/frame.h
+++ b/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 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;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 8aa43dda8c78b47d9fc4af2f0f5303cdfacdf2eb..4a5422a4df83e3b905f388b6258af85ad078de01 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -30,6 +30,12 @@ void WXDLLEXPORT wxExit(void);
 // Yield to other apps/messages
 bool WXDLLEXPORT wxYield(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
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index a69fa86430adf563e1d518d23058455cf6adc5d1..b49aa6a2c29ad258984dba619a04b30aa925b15d 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -74,6 +74,7 @@ public:
 
     //
     // Accessors
 
     //
     // Accessors

+    //

     bool Ok(void) const {return m_bIsInit; }
 
     //
     bool Ok(void) const {return m_bIsInit; }
 
     //

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index 381170896a0b3709d86f7242c402dfc822f51429..948351c469e3adf45d8446fc0bbb5fbf25511286 100644 (file)
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -21,6 +21,8 @@
 
 class WXDLLEXPORT wxFrame;
 
 
 class WXDLLEXPORT wxFrame;
 

+void wxSetShortCutKey(wxChar* zText);
+

 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index c8885cb0c49ba12fd59e4bcbe0396f06d30593bd..b1862f8a2e7d78269e191f1f98415b318b555c7e 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -125,7 +125,8 @@ void wxWindowBase::InitBase()
     m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
 
     // GRG, changed Mar/2000
     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);
     m_font = *wxSWISS_FONT;         //      and this?
 #else
     m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);