Added a mask to some of the images

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

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 6fcbc5c300fb31f3ea8e596a72586040fa03bf4f..7556ff983d1743abc13bef3113231d083a020ce2 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -19,17 +19,23 @@
 #pragma interface "laywin.h"
 #endif
 
-#include "wx/sashwin.h"
+#if wxUSE_SASH
+    #include "wx/sashwin.h"
+#endif // wxUSE_SASH
 
-const wxEventType wxEVT_QUERY_LAYOUT_INFO =     wxEVT_FIRST + 1500;
-const wxEventType wxEVT_CALCULATE_LAYOUT =      wxEVT_FIRST + 1501;
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO, 1500)
+    DECLARE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT, 1501)
+END_DECLARE_EVENT_TYPES()
 
-enum wxLayoutOrientation {
+enum wxLayoutOrientation
+{
     wxLAYOUT_HORIZONTAL,
     wxLAYOUT_VERTICAL
 };
 
-enum wxLayoutAlignment {
+enum wxLayoutAlignment
+{
     wxLAYOUT_NONE,
     wxLAYOUT_TOP,
     wxLAYOUT_LEFT,
@@ -96,7 +102,8 @@ protected:
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 
-#define EVT_QUERY_LAYOUT_INFO(func)  { wxEVT_QUERY_LAYOUT_INFO, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryLayoutInfoEventFunction) & func, NULL },
+#define EVT_QUERY_LAYOUT_INFO(func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryLayoutInfoEventFunction) & func, NULL ),
 
 /*
  * This event is used to take a bite out of the available client area.
@@ -126,7 +133,10 @@ protected:
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 
-#define EVT_CALCULATE_LAYOUT(func)  { wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL },
+#define EVT_CALCULATE_LAYOUT(func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL ),
+
+#if wxUSE_SASH
 
 // 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
@@ -135,7 +145,18 @@ class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow
 {
     DECLARE_CLASS(wxSashLayoutWindow)
 public:
+    wxSashLayoutWindow()
+    {
+        Init();
+    }
+
     wxSashLayoutWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow")
+    {
+        Create(parent, id, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow");
 
 // Accessors
@@ -155,7 +176,10 @@ public:
 
     // Called by layout algorithm to retrieve information about the window.
     void OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event);
-protected:
+
+private:
+    void Init();
+
     wxLayoutAlignment           m_alignment;
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;
@@ -163,6 +187,8 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_SASH
+
 class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
@@ -182,7 +208,7 @@ public:
         return LayoutWindow(frame, mainWindow);
     }
 
-    // mainWindow is sized to whatever's left over. This function for backward
+    // mainWindow is sized to whatever's left over.
     bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);
 };