Added a few files; fixed some warnings and wxMotif compile problems

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 8cf17984c8513efd2d3e0b35bd24927badc05543..89f992643f7c6f35e48f55400d92e326efee4d92 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -50,9 +50,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
   m_foregroundColour = parent->GetForegroundColour() ;
 
   if ( id == -1 )
   m_foregroundColour = parent->GetForegroundColour() ;
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+    m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+    m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -60,9 +60,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   if ( width < 0 && bitmap.Ok() )
   int height = size.y;
 
   if ( width < 0 && bitmap.Ok() )

-       width = bitmap.GetWidth();
+    width = bitmap.GetWidth();

   if ( height < 0 && bitmap.Ok() )
   if ( height < 0 && bitmap.Ok() )

-       height = bitmap.GetHeight();
+    height = bitmap.GetHeight();

 
   m_windowStyle = style;
 
 
   m_windowStyle = style;
 


@@ -84,7 +84,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
 

-  SetFont(* GetParent()->GetFont());
+  SetFont(GetParent()->GetFont());

 
   SetSize(x, y, width, height);
   return TRUE;
 
   SetSize(x, y, width, height);
   return TRUE;


@@ -135,7 +135,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
   rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h;
 
   if ( bitmap.Ok() )
   rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h;
 
   if ( bitmap.Ok() )

-       MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),
+    MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),

              FALSE);
   
   InvalidateRect((HWND) GetParent()->GetHWND(), &rect, TRUE);
              FALSE);
   
   InvalidateRect((HWND) GetParent()->GetHWND(), &rect, TRUE);


@@ -143,47 +143,45 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 
 bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
 
 bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {

-       long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-#ifdef __WIN32__
-       if ((style & 0xFF) == SS_BITMAP)
-       {
-               // Should we call Default() here?
-//             Default();
-
-               // Let default procedure draw the bitmap, which is defined
-               // in the Windows resource.
-               return FALSE;
-       }
+    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+#if defined(__WIN32__) && defined(SS_BITMAP)
+    if ((style & 0xFF) == SS_BITMAP)
+    {
+        // Should we call Default() here?
+//      Default();
+
+        // Let default procedure draw the bitmap, which is defined
+        // in the Windows resource.
+        return FALSE;
+    }

 #endif
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 
 #endif
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 

-       wxBitmap* bitmap = &m_messageBitmap;
-       if ( !bitmap->Ok() )
-               return FALSE;
+    wxBitmap* bitmap = &m_messageBitmap;
+    if ( !bitmap->Ok() )
+        return FALSE;

 
 

-       HDC hDC = lpDIS->hDC;
-       HDC memDC = ::CreateCompatibleDC(hDC);
+    HDC hDC = lpDIS->hDC;
+    HDC memDC = ::CreateCompatibleDC(hDC);

 
 

-       HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
+    HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());

 
 

-       if (!old)
-               return FALSE;
-
-       RECT rect = lpDIS->rcItem;
+    if (!old)
+        return FALSE;

 
        int x = lpDIS->rcItem.left;
        int y = lpDIS->rcItem.top;
        int width = lpDIS->rcItem.right - x;
        int height = lpDIS->rcItem.bottom - y;
 
 
        int x = lpDIS->rcItem.left;
        int y = lpDIS->rcItem.top;
        int width = lpDIS->rcItem.right - x;
        int height = lpDIS->rcItem.bottom - y;
 

-       // Centre the bitmap in the control area
-       int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
-       int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
+    // Centre the bitmap in the control area
+    int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
+    int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));

 
 

-       ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
+    ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);

 
 

-       ::SelectObject(memDC, old);
+    ::SelectObject(memDC, old);

 
     ::DeleteDC(memDC);
 
 
     ::DeleteDC(memDC);