Weekly OS/2 updates

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

src/os2/os2jpeg.def

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\Dev\Wx2\WxWindows\lib\os2jpeg.lib
+;From library:  H:\DEV\WX24\WXWINDOWS\LIB\os2jpeg.lib
   ;From object file:  ..\jpeg\jcomapi.c
     ;PUBDEFs (Symbols available from object file):
       jpeg_destroy
@@ -219,7 +219,7 @@ EXPORTS
   ;From object file:  ..\jpeg\jdinput.c
     ;PUBDEFs (Symbols available from object file):
       reset_input_controller
-      start_input_pass
+      start_input_pass2
       jinit_input_controller
       finish_input_pass
       consume_markers
@@ -261,8 +261,8 @@ EXPORTS
   ;From object file:  ..\jpeg\jdcoefct.c
     ;PUBDEFs (Symbols available from object file):
       decompress_data
+      start_input_pass
       decompress_smooth_data
-      start_input_pass2
       decompress_onepass
       dummy_consume_data
       consume_data

src/os2/os2png.def

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  F:\DEV\WX2\WXWINDOWS\LIB\os2png.lib
+;From library:  H:\DEV\WX24\WXWINDOWS\LIB\os2png.lib
   ;From object file:  ..\png\png.c
     ;PUBDEFs (Symbols available from object file):
       png_free_data

src/os2/toplevel.cpp

@@ -97,6 +97,40 @@ MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd)
     }
 } // end of wxDlgProc
 
+// ----------------------------------------------------------------------------
+// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a
+// module to ensure that the window is always deleted)
+// ----------------------------------------------------------------------------
+
+class wxTLWHiddenParentModule : public wxModule
+{
+public:
+    //
+    // Module init/finalize
+    //
+    virtual bool OnInit(void);
+    virtual void OnExit(void);
+
+    //
+    // Get the hidden window (creates on demand)
+    //
+    static HWND GetHWND(void);
+
+private:
+    //
+    // The HWND of the hidden parent
+    //
+    static HWND                     m_shWnd;
+
+    //
+    // The class used to create it
+    //
+    static const wxChar*            m_szClassName;
+    DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
+}; // end of CLASS wxTLWHiddenParentModule
+
+IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule)
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowOS2 creation
 // ----------------------------------------------------------------------------
@@ -235,42 +269,44 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
 
 WXHWND wxTopLevelWindowOS2::OS2GetParent() const
 {
+    HWND                            hWndParent = NULL;
+
     //
     // For the frames without wxFRAME_FLOAT_ON_PARENT style we should use NULL
     // parent HWND or it would be always on top of its parent which is not what
     // we usually want (in fact, we only want it for frames with the
     // wxFRAME_FLOAT_ON_PARENT flag)
     //
-    wxWindow*                           pParent;
-
     if (HasFlag(wxFRAME_FLOAT_ON_PARENT) )
     {
-        pParent = GetParent();
+        const wxWindow*             pParent = GetParent();
 
-        // this flag doesn't make sense then and will be ignored
+        if (!pParent)
-        wxASSERT_MSG( pParent,
+        {
-                      _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
+            //
+            // This flag doesn't make sense then and will be ignored
+            //
+            wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
         }
-    else // don't float on parent, must not be owned
+        else
         {
-        pParent = NULL;
+            hWndParent = GetHwndOf(pParent);
         }
-    if (HasFlag(wxFRAME_NO_TASKBAR) && !pParent)
+    }
-    {
+    //else: don't float on parent, must not be owned
-        if (!m_spHiddenParent)
-        {
-            m_spHiddenParent = new wxTopLevelWindowOS2(NULL, -1, _T(""));
 
     //
-            // We shouldn't leave it in wxTopLevelWindows or we wouldn't
+    // Now deal with the 2nd taskbar-related problem (see comments above in
-            // terminate the app when the last user-created frame is deleted --
+    // OS2GetStyle())
-            // see ~wxTopLevelWindowMSW
     //
-            wxTopLevelWindows.DeleteObject(m_spHiddenParent);
+    if (HasFlag(wxFRAME_NO_TASKBAR) && !hWndParent)
+    {
+        //
+        // Use hidden parent
+        //
+        hWndParent = wxTLWHiddenParentModule::GetHWND();
     }
-        pParent = m_spHiddenParent;
+    return (WXHWND)hWndParent;
-    }
-    return pParent ? pParent->GetHWND() : NULL;
 } // end of wxTopLevelWindowOS2::OS2GetParent
 
 bool wxTopLevelWindowOS2::CreateDialog(
@@ -593,17 +629,6 @@ bool wxTopLevelWindowOS2::Create(
 
 wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
 {
-    if (this == m_spHiddenParent)
-    {
-        //
-        // Stop [infinite] recursion which would otherwise happen when we do
-        // "delete ms_hiddenParent" below -- and we're not interested in doing
-        // anything of the rest below for that window because the rest of
-        // wxWindows doesn't even know about it
-        //
-        return;
-    }
-
     if (wxModelessWindows.Find(this))
         wxModelessWindows.DeleteObject(this);
 
@@ -626,19 +651,6 @@ wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
                              );
         }
     }
-
-    //
-    // If this is the last top-level window, we're going to exit and we should
-    // delete ms_hiddenParent now to avoid leaking it
-    //
-    if (IsLastBeforeExit())
-    {
-        if (m_spHiddenParent)
-        {
-            delete m_spHiddenParent;
-            m_spHiddenParent = NULL;
-        }
-    }
 } // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2
 
 // ----------------------------------------------------------------------------
@@ -712,7 +724,7 @@ bool wxTopLevelWindowOS2::Show(
     }
     else
     {
-        DBUG_RETURN(FALSE);
+        return FALSE;
     }
     if (bShow)
     {
@@ -1031,3 +1043,75 @@ bool wxTopLevelWindowOS2::EnableCloseButton(
     return TRUE;
 } // end of wxTopLevelWindowOS2::EnableCloseButton
 
+// ============================================================================
+// wxTLWHiddenParentModule implementation
+// ============================================================================
+
+HWND          wxTLWHiddenParentModule::m_shWnd = NULL;
+const wxChar* wxTLWHiddenParentModule::m_szClassName = NULL;
+
+bool wxTLWHiddenParentModule::OnInit()
+{
+    m_shWnd = NULL;
+    m_szClassName = NULL;
+    return TRUE;
+} // end of wxTLWHiddenParentModule::OnInit
+
+void wxTLWHiddenParentModule::OnExit()
+{
+    if (m_shWnd)
+    {
+        if (!::WinDestroyWindow(m_shWnd))
+        {
+            wxLogLastError(_T("DestroyWindow(hidden TLW parent)"));
+        }
+        m_shWnd = NULL;
+    }
+
+    m_szClassName = NULL;
+} // end of wxTLWHiddenParentModule::OnExit
+
+/* static */
+HWND wxTLWHiddenParentModule::GetHWND()
+{
+    if (!m_shWnd)
+    {
+        if (!m_szClassName)
+        {
+            static const wxChar*    zHIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
+
+            if (!::WinRegisterClass( wxGetInstance()
+                                    ,zHIDDEN_PARENT_CLASS
+                                    ,NULL
+                                    ,0
+                                    ,sizeof(ULONG)
+                                   ))
+            {
+                wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")"));
+            }
+            else
+            {
+                m_szClassName = zHIDDEN_PARENT_CLASS;
+            }
+        }
+        m_shWnd = ::WinCreateWindow( HWND_DESKTOP
+                                    ,m_szClassName
+                                    ,""
+                                    ,0L
+                                    ,(LONG)0L
+                                    ,(LONG)0L
+                                    ,(LONG)0L
+                                    ,(LONG)0L
+                                    ,NULLHANDLE
+                                    ,HWND_TOP
+                                    ,0L
+                                    ,NULL
+                                    ,NULL
+                                   );
+        if (!m_shWnd)
+        {
+            wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
+        }
+    }
+    return m_shWnd;
+} // end of wxTLWHiddenParentModule::GetHWND

src/os2/utils.cpp

@@ -710,7 +710,7 @@ wxChar* wxGetUserHome (
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
-            Unix2DosFilename(wxBuffer);
+            wxUnix2DosFilename(wxBuffer);
             wxStrcpy(zHome, wxBuffer);
             delete[] wxBuffer;
             return zHome;

src/os2/window.cpp

@@ -2815,6 +2815,11 @@ MRESULT wxWindowOS2::OS2WindowProc(
                                                                    ,&nX
                                                                    ,&nY
                                                                   );
+                    if (!pWin->IsOfStandardClass())
+                    {
+                        if (uMsg == WM_BUTTON1DOWN && pWin->AcceptsFocus() )
+                            pWin->SetFocus();
+                    }
                     bProcessed = pWin->HandleMouseEvent( uMsg
                                                         ,nX
                                                         ,nY

src/os2/wx23.def

@@ -14881,14 +14881,23 @@ EXPORTS
       __vft19wxTopLevelWindowOS28wxObject
       ;wxTopLevelWindowOS2::CreateFrame(const wxString&,const wxPoint&,const wxSize&)
       CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
+      ;wxTLWHiddenParentModule::m_shWnd
+      m_shWnd__23wxTLWHiddenParentModule
       ;wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
       __dt__19wxTopLevelWindowOS2Fv
       ;wxTopLevelWindowOS2::sm_eventTableEntries
       sm_eventTableEntries__19wxTopLevelWindowOS2
+      ;wxTLWHiddenParentModule::OnInit()
+      OnInit__23wxTLWHiddenParentModuleFv
+      ;wxTLWHiddenParentModule::GetHWND()
+      GetHWND__23wxTLWHiddenParentModuleFv
       ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
       ShowFullScreen__19wxTopLevelWindowOS2FUll
+      __vft23wxTLWHiddenParentModule8wxObject
       ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)
       CreateDialog__19wxTopLevelWindowOS2FUlRC8wxStringRC7wxPointRC6wxSize
+      ;wxTLWHiddenParentModule::sm_classwxTLWHiddenParentModule
+      sm_classwxTLWHiddenParentModule__23wxTLWHiddenParentModule
       ;wxTopLevelWindowOS2::DoShowWindow(int)
       DoShowWindow__19wxTopLevelWindowOS2Fi
       ;wxTopLevelWindowOS2::Init()
@@ -14903,6 +14912,8 @@ EXPORTS
       Iconize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
       DoSetClientSize__19wxTopLevelWindowOS2FiT1
+      ;wxTLWHiddenParentModule::m_szClassName
+      m_szClassName__23wxTLWHiddenParentModule
       ;wxTopLevelWindowOS2::IsMaximized() const
       IsMaximized__19wxTopLevelWindowOS2CFv
       ;wxTopLevelWindowOS2::m_spHiddenParent
@@ -14911,6 +14922,8 @@ EXPORTS
       SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
       ;wxTopLevelWindowOS2::Restore()
       Restore__19wxTopLevelWindowOS2Fv
+      ;wxTLWHiddenParentModule::OnExit()
+      OnExit__23wxTLWHiddenParentModuleFv
       ;wxTopLevelWindowOS2::OnActivate(wxActivateEvent&)
       OnActivate__19wxTopLevelWindowOS2FR15wxActivateEvent
       ;wxTopLevelWindowOS2::Maximize(unsigned long)
@@ -14919,6 +14932,8 @@ EXPORTS
       EnableCloseButton__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoGetClientSize(int*,int*) const
       DoGetClientSize__19wxTopLevelWindowOS2CFPiT1
+      ;wxConstructorForwxTLWHiddenParentModule()
+      wxConstructorForwxTLWHiddenParentModule__Fv
       ;wxTopLevelWindowOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxTopLevelWindowOS2::Show(unsigned long)