Removed small OGL glitches; added new sample

[wxWidgets.git] / include / wx / generic / laywin.h

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 8383855e1b27daf729d704d3a1346e990d50e866..47182c627cd3c9e9b68e3088bee2f084e13f78f3 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -53,7 +53,7 @@ enum wxLayoutAlignment {
  * orientation and size.
  */
 
  * orientation and size.
  */
 

-class wxQueryLayoutInfoEvent: public wxEvent
+class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent

 {
 DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:


@@ -100,7 +100,7 @@ typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEv
  * This event is used to take a bite out of the available client area.
  */
 
  * This event is used to take a bite out of the available client area.
  */
 

-class wxCalculateLayoutEvent: public wxEvent
+class WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent

 {
 DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 public:


@@ -129,7 +129,7 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.

-class wxSashLayoutWindow: public wxSashWindow
+class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow

 {
     DECLARE_CLASS(wxSashLayoutWindow)
 public:
 {
     DECLARE_CLASS(wxSashLayoutWindow)
 public:


@@ -165,7 +165,7 @@ class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm

-class wxLayoutAlgorithm: public wxObject
+class WXDLLEXPORT wxLayoutAlgorithm: public wxObject

 {
 public:
     wxLayoutAlgorithm() {}
 {
 public:
     wxLayoutAlgorithm() {}


@@ -173,8 +173,15 @@ public:
     // The MDI client window is sized to whatever's left over.
     bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL);
 
     // The MDI client window is sized to whatever's left over.
     bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL);
 

-    // mainWindow is sized to whatever's left over.
-    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow);
+    // mainWindow is sized to whatever's left over. This function for backward
+    // compatibility; use LayoutWindow.
+    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = (wxWindow*) NULL)
+    {
+        return LayoutWindow(frame, mainWindow);
+    }
+
+    // mainWindow is sized to whatever's left over. This function for backward
+    bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);

 };
 
 #endif
 };
 
 #endif