Fixes for WinCE

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

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 7556ff983d1743abc13bef3113231d083a020ce2..2eed2c6781a3a37e5d8f1e6d28c1af5bfaceb540 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -15,7 +15,7 @@
 #ifndef _WX_LAYWIN_H_G_
 #define _WX_LAYWIN_H_G_
 
 #ifndef _WX_LAYWIN_H_G_
 #define _WX_LAYWIN_H_G_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "laywin.h"
 #endif
 
 #pragma interface "laywin.h"
 #endif
 


@@ -24,8 +24,8 @@
 #endif // wxUSE_SASH
 
 BEGIN_DECLARE_EVENT_TYPES()
 #endif // wxUSE_SASH
 
 BEGIN_DECLARE_EVENT_TYPES()

-    DECLARE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO, 1500)
-    DECLARE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT, 1501)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, 1500)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, 1501)

 END_DECLARE_EVENT_TYPES()
 
 enum wxLayoutOrientation
 END_DECLARE_EVENT_TYPES()
 
 enum wxLayoutOrientation


@@ -59,11 +59,9 @@ enum wxLayoutAlignment
  * orientation and size.
  */
 
  * orientation and size.
  */
 

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)

 public:
 public:

-

     wxQueryLayoutInfoEvent(wxWindowID id = 0)
     {
         SetEventType(wxEVT_QUERY_LAYOUT_INFO);
     wxQueryLayoutInfoEvent(wxWindowID id = 0)
     {
         SetEventType(wxEVT_QUERY_LAYOUT_INFO);


@@ -91,13 +89,17 @@ public:
     void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
     wxLayoutAlignment GetAlignment() const { return m_alignment; }
 
     void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
     wxLayoutAlignment GetAlignment() const { return m_alignment; }
 

+    virtual wxEvent *Clone() const { return new wxQueryLayoutInfoEvent(*this); }
+

 protected:
     int                     m_flags;
     int                     m_requestedLength;
     wxSize                  m_size;
     wxLayoutOrientation     m_orientation;
     wxLayoutAlignment       m_alignment;
 protected:
     int                     m_flags;
     int                     m_requestedLength;
     wxSize                  m_size;
     wxLayoutOrientation     m_orientation;
     wxLayoutAlignment       m_alignment;

-
+    
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent)

 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);


@@ -109,9 +111,8 @@ 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 WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent
+class WXDLLIMPEXP_ADV wxCalculateLayoutEvent: public wxEvent

 {
 {

-DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)

 public:
     wxCalculateLayoutEvent(wxWindowID id = 0)
     {
 public:
     wxCalculateLayoutEvent(wxWindowID id = 0)
     {


@@ -119,16 +120,23 @@ public:
         m_flags = 0;
         m_id = id;
     }
         m_flags = 0;
         m_id = id;
     }

-// Read by the app
-    inline void SetFlags(int flags) { m_flags = flags; }
-    inline int GetFlags() const { return m_flags; }

 
 

-// Set by the app
-    inline void SetRect(const wxRect& rect) { m_rect = rect; }
-    inline wxRect GetRect() const { return m_rect; }
+    // Read by the app
+    void SetFlags(int flags) { m_flags = flags; }
+    int GetFlags() const { return m_flags; }
+
+    // Set by the app
+    void SetRect(const wxRect& rect) { m_rect = rect; }
+    wxRect GetRect() const { return m_rect; }
+
+    virtual wxEvent *Clone() const { return new wxCalculateLayoutEvent(*this); }
+

 protected:
     int                     m_flags;
     wxRect                  m_rect;
 protected:
     int                     m_flags;
     wxRect                  m_rect;

+    
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent)

 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);


@@ -141,9 +149,8 @@ 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 WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow
+class WXDLLIMPEXP_ADV wxSashLayoutWindow: public wxSashWindow

 {
 {

-    DECLARE_CLASS(wxSashLayoutWindow)

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


@@ -151,13 +158,13 @@ public:
     }
 
     wxSashLayoutWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
     }
 
     wxSashLayoutWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow")
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"))

     {
         Create(parent, id, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
     {
         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");
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"));

 
 // Accessors
     inline wxLayoutAlignment GetAlignment() const { return m_alignment; };
 
 // Accessors
     inline wxLayoutAlignment GetAlignment() const { return m_alignment; };


@@ -184,7 +191,9 @@ private:
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;
 
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;
 

-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashLayoutWindow)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // wxUSE_SASH
 };
 
 #endif // wxUSE_SASH


@@ -193,20 +202,19 @@ class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm

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

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

+#if wxUSE_MDI_ARCHITECTURE

     // 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);

+#endif // wxUSE_MDI_ARCHITECTURE

 
     // mainWindow is sized to whatever's left over. This function for backward
     // compatibility; use LayoutWindow.
 
     // 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);
-    }
+    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = (wxWindow*) NULL);

 
     // mainWindow is sized to whatever's left over.
     bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);
 
     // mainWindow is sized to whatever's left over.
     bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);