define wxART_* constanst in way that will make adding XRC support easier

[wxWidgets.git] / src / os2 / toplevel.cpp

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 0b4219617a2a15cd0fa42103df1b24e4e5d41d65..237037106b7822b446b3f571c6d551e4b662b387 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -83,9 +83,10 @@ MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd)
         case WM_INITDLG:
             //
             // For this message, returning TRUE tells system to set focus to
         case WM_INITDLG:
             //
             // For this message, returning TRUE tells system to set focus to

-            // the first control in the dialog box, but as we set the focus
-            // ourselves, we return FALSE from here as well, so fall through
+            // the first control in the dialog box, but we set the focus
+            // ourselves, however in OS/2 we must return true to enable the dialog

             //
             //

+            return (MRESULT)TRUE;

         default:
             //
             // For all the other ones, FALSE means that we didn't process the
         default:
             //
             // For all the other ones, FALSE means that we didn't process the


@@ -396,7 +397,7 @@ bool wxTopLevelWindowOS2::CreateDialog(
                       ,nY
                       ,nWidth
                       ,nHeight
                       ,nY
                       ,nWidth
                       ,nHeight

-                      ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW
+                      ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW | SWP_ACTIVATE

                      );
     ::WinQueryWindowPos(GetHwnd(), GetSwp());
     m_hFrame = m_hWnd;
                      );
     ::WinQueryWindowPos(GetHwnd(), GetSwp());
     m_hFrame = m_hWnd;


@@ -721,15 +722,6 @@ bool wxTopLevelWindowOS2::Show(
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             m_bIconized = vSwp.fl & SWP_MINIMIZE;
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             m_bIconized = vSwp.fl & SWP_MINIMIZE;

-            if (hWndParent)
-                ::WinSetWindowPos( hWndParent
-                                  ,HWND_TOP
-                                  ,vSwp.x
-                                  ,vSwp.y
-                                  ,vSwp.cx
-                                  ,vSwp.cy
-                                  ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE
-                                 );

             ::WinEnableWindow(hWndParent, TRUE);
         }
     }
             ::WinEnableWindow(hWndParent, TRUE);
         }
     }