merge of wxMac into main repository

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 72126d5668f84205f2bd823b50cae51fee57fc56..bb3c5a2cd94c66266d5580d908f45d279b93970a 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -185,6 +185,7 @@ public:
     void OnSetFocus(wxFocusEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void OnSetFocus(wxFocusEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);

+    void OnPaint(wxPaintEvent& event);

 
 public:
     // For implementation purposes - sometimes decorations make the client area
 
 public:
     // For implementation purposes - sometimes decorations make the client area


@@ -207,7 +208,7 @@ public:
 
     // Make a Windows extended style from the given wxWindows window style
     static WXDWORD MakeExtendedStyle(long style,
 
     // Make a Windows extended style from the given wxWindows window style
     static WXDWORD MakeExtendedStyle(long style,

-                                     bool eliminateBorders = TRUE);
+                                     bool eliminateBorders = FALSE);

     // Determine whether 3D effects are wanted
     WXDWORD Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D) const;
 
     // Determine whether 3D effects are wanted
     WXDWORD Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D) const;