fixed messed up indentation

[wxWidgets.git] / src / aui / framemanager.cpp

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index c94279ccd65962b8d605d784e8b725e955965044..3c0b35a969c6f6d0f2f199ad12433a5815409ae5 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -64,7 +64,7 @@ DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER)
     // a few defines to avoid nameclashes
     #define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
     #define __AIFF__
     // a few defines to avoid nameclashes
     #define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
     #define __AIFF__

-    #include "wx/mac/private.h"
+    #include "wx/osx/private.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -970,7 +970,7 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)
     if (pinfo.name.empty() || already_exists)
     {
         pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),
     if (pinfo.name.empty() || already_exists)
     {
         pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),

-             ((unsigned long)pinfo.window) & 0xffffffff,
+             wxPtrToUInt(pinfo.window) & 0xffffffff,

              (unsigned int)time(NULL),
 #ifdef __WXWINCE__
              (unsigned int)GetTickCount(),
              (unsigned int)time(NULL),
 #ifdef __WXWINCE__
              (unsigned int)GetTickCount(),


@@ -2319,8 +2319,11 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
                 LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
         }
 
                 LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
         }
 

-        cont->Add(middle, 1, wxEXPAND);
-
+        if (middle->GetChildren().GetCount() > 0)
+            cont->Add(middle, 1, wxEXPAND);
+             else
+            delete middle;
+            

 
 
         // find any bottom docks in this layer
 
 
         // find any bottom docks in this layer


@@ -3228,7 +3231,7 @@ void wxAuiManager::ShowHint(const wxRect& rect)
         // nasty redrawn problems.
         clip.Intersect(m_frame->GetRect());
 
         // nasty redrawn problems.
         clip.Intersect(m_frame->GetRect());
 

-        screendc.SetClippingRegion(clip);
+        screendc.SetDeviceClippingRegion(clip);

 
         wxBitmap stipple = wxPaneCreateStippleBitmap();
         wxBrush brush(stipple);
 
         wxBitmap stipple = wxPaneCreateStippleBitmap();
         wxBrush brush(stipple);