xti additions / changes, trying to reduce dependencies

[wxWidgets.git] / src / msw / statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index fa803fe344fd3e0032ed4e4b7fb88fa2a488c95c..a2a8698bfbcf74a7fff873a626d206333ab0abb7 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "statbmp.h"
 #endif
 
     #pragma implementation "statbmp.h"
 #endif
 


@@ -46,6 +46,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 

+/*
+       TODO PROPERTIES :
+               bitmap
+*/
+

 // ===========================================================================
 // implementation
 // ===========================================================================
 // ===========================================================================
 // implementation
 // ===========================================================================


@@ -122,7 +127,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
 #else // Win16
                            _T("BUTTON"),
 #endif // Win32/16
 #else // Win16
                            _T("BUTTON"),
 #endif // Win32/16

-                           _T(""), pos, size) )
+                           wxEmptyString, pos, size) )

     {
         // control creation failed
         return FALSE;
     {
         // control creation failed
         return FALSE;


@@ -134,6 +139,11 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

+wxBorder wxStaticBitmap::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+

 WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);


@@ -264,10 +274,12 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
                                    WXWPARAM wParam,
                                    WXLPARAM lParam)
 {
                                    WXWPARAM wParam,
                                    WXLPARAM lParam)
 {

+#ifndef __WXWINCE__

     // Ensure that static items get messages. Some controls don't like this
     // message to be intercepted (e.g. RichEdit), hence the tests.
     if ( nMsg == WM_NCHITTEST )
         return (long)HTCLIENT;
     // Ensure that static items get messages. Some controls don't like this
     // message to be intercepted (e.g. RichEdit), hence the tests.
     if ( nMsg == WM_NCHITTEST )
         return (long)HTCLIENT;

+#endif

 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }