removing dependancy on mac headers from public wx headers (eventually adding wx/mac...

[wxWidgets.git] / src / common / layout.cpp

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 3b9ec73f6f6546d6f2f20622e33314c3af5346af..8dbb8ea8dc5e93601ff196e31f90c85df0b784d5 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -72,7 +72,7 @@ void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW,
 
     if ( rel == wxPercentOf )
     {
 
     if ( rel == wxPercentOf )
     {

-        percentage = val;
+        percent = val;

     }
     else
     {
     }
     else
     {


@@ -121,7 +121,8 @@ void wxIndividualLayoutConstraint::PercentOf(wxWindowBase *otherW, wxEdge wh, in
 //
 void wxIndividualLayoutConstraint::Absolute(int val)
 {
 //
 void wxIndividualLayoutConstraint::Absolute(int val)
 {

-    value = val; relationship = wxAbsolute;
+    value = val;
+    relationship = wxAbsolute;

 }
 
 // Reset constraint if it mentions otherWin
 }
 
 // Reset constraint if it mentions otherWin


@@ -138,8 +139,8 @@ bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW)
         otherWin = (wxWindowBase *) NULL;
         return TRUE;
     }
         otherWin = (wxWindowBase *) NULL;
         return TRUE;
     }

-    else
-        return FALSE;
+
+    return FALSE;

 }
 
 // Try to satisfy constraint
 }
 
 // Try to satisfy constraint