reverted Julian's unintentional breakage of wxChoice

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index a273ada371dc545c07354bd9eaca5f13dbedb7ef..f0a4438e1653a9eaf3eab3eead15dfdc0d08dadc 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -923,9 +923,10 @@ bool wxFrame::HandlePaint()
             //
             // Icons in PM are the same as "pointers"
             //
             //
             // Icons in PM are the same as "pointers"
             //

+            const wxIcon&           vIcon = GetIcon();

             HPOINTER                hIcon;
 
             HPOINTER                hIcon;
 

-            if (m_icon.Ok())
+            if (vIcon.Ok())

                 hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
             else
                 hIcon = (HPOINTER)m_hDefaultIcon;
                 hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
             else
                 hIcon = (HPOINTER)m_hDefaultIcon;


@@ -1079,7 +1080,6 @@ bool wxFrame::HandleSize(
 
         vEvent.SetEventObject(this);
         bProcessed = GetEventHandler()->ProcessEvent(vEvent);
 
         vEvent.SetEventObject(this);
         bProcessed = GetEventHandler()->ProcessEvent(vEvent);

-        AlterChildPos();

     }
     return bProcessed;
 } // end of wxFrame::HandleSize
     }
     return bProcessed;
 } // end of wxFrame::HandleSize


@@ -1380,9 +1380,10 @@ MRESULT wxFrame::OS2WindowProc(
 
         case CM_QUERYDRAGIMAGE:
             {
 
         case CM_QUERYDRAGIMAGE:
             {

+                const wxIcon&           vIcon = GetIcon();

                 HPOINTER                hIcon;
 
                 HPOINTER                hIcon;
 

-                if (m_icon.Ok())
+                if (vIcon.Ok())

                     hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;
                     hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;