1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index c5ba278494049afeeb2e79b9969221a1734653dc..82773a5d17e80dc80e42bb7751a7ad9a49df74f6 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statbr95.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -277,6 +273,10 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
     return true;
 }
 
     return true;
 }
 

+#ifndef SWP_NOSENDCHANGING
+#define SWP_NOSENDCHANGING 0
+#endif
+

 void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
 {
     if ( GetParent()->IsSizeDeferred() )
 void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
 {
     if ( GetParent()->IsSizeDeferred() )


@@ -342,6 +342,7 @@ void wxStatusBar95::SetStatusStyles(int n, const int styles[])
 WXLRESULT
 wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXLRESULT
 wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

+#ifndef __WXWINCE__

     if ( nMsg == WM_WINDOWPOSCHANGING )
     {
         WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
     if ( nMsg == WM_WINDOWPOSCHANGING )
     {
         WINDOWPOS *lpPos = (WINDOWPOS *)lParam;


@@ -349,6 +350,9 @@ wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         GetPosition(&x, &y);
         GetSize(&w, &h);
 
         GetPosition(&x, &y);
         GetSize(&w, &h);
 

+        // we need real window coords and not wx client coords
+        AdjustForParentClientOrigin(x, y);
+

         lpPos->x  = x;
         lpPos->y  = y;
         lpPos->cx = w;
         lpPos->x  = x;
         lpPos->y  = y;
         lpPos->cx = w;


@@ -356,6 +360,7 @@ wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
         return 0;
     }
 
         return 0;
     }

+

     if ( nMsg == WM_NCLBUTTONDOWN )
     {
         // if hit-test is on gripper then send message to TLW to begin
     if ( nMsg == WM_NCLBUTTONDOWN )
     {
         // if hit-test is on gripper then send message to TLW to begin


@@ -376,6 +381,7 @@ wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             }
         }
     }
             }
         }
     }

+#endif

 
     return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);
 }