Revert Cygwin changes

[wxWidgets.git] / include / wx / msw / window.h

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index dc7bbad25652563f19cab827f57e23fa4d27df29..218bd938bd7ccb02b2fe25a5c803858ac2778c46 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -47,6 +47,12 @@ enum
 
 class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {
 
 class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {

+    friend class wxSpinCtrl;
+    friend class wxSlider;
+    friend class wxRadioBox;
+#if defined __VISUALC__ && __VISUALC__ <= 1200
+    friend class wxWindowMSW;
+#endif

 public:
     wxWindowMSW() { Init(); }
 
 public:
     wxWindowMSW() { Init(); }
 


@@ -290,7 +296,8 @@ public:
     bool HandleDestroy();
 
     bool HandlePaint();
     bool HandleDestroy();
 
     bool HandlePaint();

-    bool HandleEraseBkgnd(WXHDC pDC);
+    bool HandlePrintClient(WXHDC hDC);
+    bool HandleEraseBkgnd(WXHDC hDC);

 
     bool HandleMinimize();
     bool HandleMaximize();
 
     bool HandleMinimize();
     bool HandleMaximize();


@@ -365,15 +372,15 @@ public:
     //
     // the base class version returns a solid brush if we have a non default
     // background colour or 0 otherwise
     //
     // the base class version returns a solid brush if we have a non default
     // background colour or 0 otherwise

-    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindow *child);
+    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd);

 
     // return the background brush to use for painting the given window by
     // quering the parent windows via their MSWGetBgBrushForChild() recursively
     //
 
     // return the background brush to use for painting the given window by
     // quering the parent windows via their MSWGetBgBrushForChild() recursively
     //

-    // winToPaint is normally NULL meaning this window itself, but it can also
+    // hWndToPaint is normally NULL meaning this window itself, but it can also

     // be a child of this window which is used by the static box and could be
     // potentially useful for other transparent controls
     // be a child of this window which is used by the static box and could be
     // potentially useful for other transparent controls

-    WXHBRUSH MSWGetBgBrush(WXHDC hDC, wxWindow *winToPaint = NULL);
+    WXHBRUSH MSWGetBgBrush(WXHDC hDC, WXHWND hWndToPaint = NULL);

 
     // gives the parent the possibility to draw its children background, e.g.
     // this is used by wxNotebook to do it using DrawThemeBackground()
 
     // gives the parent the possibility to draw its children background, e.g.
     // this is used by wxNotebook to do it using DrawThemeBackground()


@@ -487,6 +494,11 @@ private:
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 

+    // When deferred positioning is done these hold the pending changes, and
+    // are used for the default values if another size/pos changes is done on
+    // this window before the group of deferred changes is completed.
+    wxPoint     m_pendingPosition;
+    wxSize      m_pendingSize;

 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)
 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)