Supress SetFocus() warning in wxVListBoxComboPopup

[wxWidgets.git] / src / ribbon / art_aui.cpp

diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index 39715c47b93c3d9c49cd047392d1fd2ca5267ebe..0e452bdd6bbefa09a8c1d292692204c90f6c585e 100644 (file)
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -15,12 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dc.h"
-#include "wx/settings.h"
-#include "wx/ribbon/art.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/art.h"

 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"
 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"


@@ -28,12 +25,16 @@
 #include "wx/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP
 #include "wx/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP

+#include "wx/dc.h"
+#include "wx/settings.h"

 #endif
 
 #ifdef __WXMSW__
 #include "wx/msw/private.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/private.h"
 #endif
 
 #ifdef __WXMSW__
 #include "wx/msw/private.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/private.h"

+// only for kThemeBrushToolbarBackground
+#include <Carbon/Carbon.h>

 #endif
 
 wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()
 #endif
 
 wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()


@@ -635,6 +636,8 @@ wxSize wxRibbonAUIArtProvider::GetPanelClientSize(
         if(client_offset)
             *client_offset = wxPoint(3, label_height + 2);
     }
         if(client_offset)
             *client_offset = wxPoint(3, label_height + 2);
     }

+    if (size.x < 0) size.x = 0;
+    if (size.y < 0) size.y = 0;

     return size;
 }
 
     return size;
 }