detect EOF properly in wxFileInputStream

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index cc725c62808cba25578b5e7f5301148b6c27aba2..aba22e63b46627fc493a296c56c85440146ee13b 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2955,7 +2955,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
 
 WXHWND wxWindowMSW::MSWGetParent() const
 {
 
 WXHWND wxWindowMSW::MSWGetParent() const
 {

-    return m_parent ? m_parent->GetHWND() : NULL;
+    return m_parent ? m_parent->GetHWND() : WXHWND(NULL);

 }
 
 bool wxWindowMSW::MSWCreate(const wxChar *wclass,
 }
 
 bool wxWindowMSW::MSWCreate(const wxChar *wclass,


@@ -3021,7 +3021,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
 // ---------------------------------------------------------------------------
 
 #ifdef __WIN95__
 // ---------------------------------------------------------------------------
 
 #ifdef __WIN95__

-// FIXME: VZ: I'm not sure at all that the order of processing is correct
+

 bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 #ifndef __WXMICROWIN__
 bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 #ifndef __WXMICROWIN__


@@ -3029,12 +3029,19 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     HWND hWnd = hdr->hwndFrom;
     wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd);
 
     HWND hWnd = hdr->hwndFrom;
     wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd);
 

-    // is this one of our windows?
+    // if the control is one of our windows, let it handle the message itself

     if ( win )
     {
         return win->MSWOnNotify(idCtrl, lParam, result);
     }
 
     if ( win )
     {
         return win->MSWOnNotify(idCtrl, lParam, result);
     }
 

+    // VZ: why did we do it? normally this is unnecessary and, besides, it
+    //     breaks the message processing for the toolbars because the tooltip
+    //     notifications were being forwarded to the toolbar child controls
+    //     (if it had any) before being passed to the toolbar itself, so in my
+    //     example the tooltip for the combobox was always shown instead of the
+    //     correct button tooltips
+#if 0

     // try all our children
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
     // try all our children
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )


@@ -3047,8 +3054,9 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }

+#endif // 0

 
 

-    // finally try this window too (catches toolbar case)
+    // by default, handle it ourselves

     return MSWOnNotify(idCtrl, lParam, result);
 #else // __WXMICROWIN__
     return FALSE;
     return MSWOnNotify(idCtrl, lParam, result);
 #else // __WXMICROWIN__
     return FALSE;


@@ -3131,6 +3139,7 @@ bool wxWindowMSW::MSWOnNotify(int WXUNUSED(idCtrl),
 
     return FALSE;
 }
 
     return FALSE;
 }

+

 #endif // __WIN95__
 
 // ---------------------------------------------------------------------------
 #endif // __WIN95__
 
 // ---------------------------------------------------------------------------