Added wxPoem sample; fixed some Dialog Editor problems; wxStaticBitmap and wxBitmapButton

[wxWidgets.git] / include / wx / layout.h

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 2f525bb1f05bb863a303058eef43f08fe918b2e1..83b610a2ea33b586ee2633b2562a0c232aea6fd4 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __LAYOUTH__
-#define __LAYOUTH__
+#ifndef _WX_LAYOUTH__
+#define _WX_LAYOUTH__

 
 #ifdef __GNUG__
 #pragma interface "layout.h"
 
 #ifdef __GNUG__
 #pragma interface "layout.h"


@@ -48,6 +48,9 @@ class WXDLLEXPORT wxIndividualLayoutConstraint: public wxObject
   DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
 
  protected:
   DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
 
  protected:

+   // To be allowed to modify the internal variables
+   friend class wxIndividualLayoutConstraint_Serialize;
+

    // 'This' window is the parent or sibling of otherWin
    wxWindow *otherWin;
 
    // 'This' window is the parent or sibling of otherWin
    wxWindow *otherWin;
 


@@ -306,4 +309,4 @@ class WXDLLEXPORT wxSpacingSizer: public wxSizer
 };
 
 #endif
 };
 
 #endif

-    // __LAYOUTH__
+    // _WX_LAYOUTH__