GetLabelTop should return the stripped label, for compatibility.

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 7a072ae63d81902c82802d03739e935e844af4b7..153de8cc573832c464694ac9419dca425aa502a3 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -4,9 +4,23 @@
 //                        Robin Dunn <robin@aldunn.com>
 // The License.txt file describes the conditions under which this software may be distributed.
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STC
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"
+#endif // WX_PRECOMP
+
 #include <ctype.h>
 
-#include "wx/wx.h"
 #include "wx/encconv.h"
 #include "wx/listctrl.h"
 #include "wx/mstream.h"
@@ -21,6 +35,7 @@
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
+#include "wx/stc/private.h"
 
 
 
@@ -357,7 +372,6 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);
     wxAlphaPixelData pixData(bmp);
-    pixData.UseAlpha();
 
     // Set the fill pixels
     ColourDesired cdf(fill.AsLong());
@@ -769,7 +783,7 @@ END_EVENT_TABLE()
 
 
 #if wxUSE_POPUPWIN //-----------------------------------
-#include <wx/popupwin.h>
+#include "wx/popupwin.h"
 
 
 //
@@ -899,6 +913,7 @@ END_EVENT_TABLE()
 
 
 #else // !wxUSE_POPUPWIN -----------------------------------
+#include "wx/frame.h"
 
 // A normal window to place the wxSTCListBox upon, but make it behave as much
 // like a wxPopupWindow as possible
@@ -1558,3 +1573,5 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 }
 
 #endif
+
+#endif // wxUSE_STC