doubleclick selects word

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

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 81785a3d6d303f7794d474bc54ecfb0be8fb1d2c..992e1b0d3415f04ea887700d0193cff22b4b2fff 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "laywin.h"
 #endif
 
@@ -61,9 +61,7 @@ enum wxLayoutAlignment
 
 class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent
 {
-DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:
-
     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; }
 
+    virtual wxEvent *Clone() const { return new wxQueryLayoutInfoEvent(*this); }
+
 protected:
     int                     m_flags;
     int                     m_requestedLength;
     wxSize                  m_size;
     wxLayoutOrientation     m_orientation;
     wxLayoutAlignment       m_alignment;
-
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
@@ -111,7 +113,6 @@ typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEv
 
 class WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent
 {
-DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 public:
     wxCalculateLayoutEvent(wxWindowID id = 0)
     {
@@ -119,16 +120,23 @@ public:
         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;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
@@ -143,7 +151,6 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
 // an IDE-style interface.
 class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow
 {
-    DECLARE_CLASS(wxSashLayoutWindow)
 public:
     wxSashLayoutWindow()
     {
@@ -151,13 +158,13 @@ public:
     }
 
     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,
-        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; };
@@ -184,7 +191,9 @@ private:
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;
 
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_CLASS(wxSashLayoutWindow)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // wxUSE_SASH
@@ -205,10 +214,7 @@ public:
 
     // 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);