64/32 bit fixes

[wxWidgets.git] / src / palmos / bmpbuttn.cpp

diff --git a/src/palmos/bmpbuttn.cpp b/src/palmos/bmpbuttn.cpp
index 8290018f663fd4dc7b6eb889eee3469a55da150e..72b08d09537331d396c23fdd7642ea2f6e1e9c68 100644 (file)
--- a/src/palmos/bmpbuttn.cpp
+++ b/src/palmos/bmpbuttn.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/bmpbuttn.cpp
 // Purpose:     wxBitmapButton
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/bmpbuttn.cpp
 // Purpose:     wxBitmapButton

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bmpbuttn.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,14 +18,13 @@
 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

+#include "wx/bmpbuttn.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/bmpbuttn.h"

     #include "wx/log.h"
     #include "wx/dcmemory.h"
 #endif
 
     #include "wx/log.h"
     #include "wx/dcmemory.h"
 #endif
 

-#include "wx/palmos/private.h"
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -47,7 +42,7 @@ wxBEGIN_FLAGS( wxBitmapButtonStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -102,11 +97,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
 
 #define FOCUS_MARGIN 3
 
 
 #define FOCUS_MARGIN 3
 

-bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
-{
-    return true;
-}
-

 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
     int right, int bottom, bool sel )
 {
 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
     int right, int bottom, bool sel )
 {


@@ -122,10 +112,6 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
 {
 }
 
 {
 }
 

-void wxBitmapButton::SetDefault()
-{
-}
-

 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize best;
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize best;


@@ -136,4 +122,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
 }
 
 #endif // wxUSE_BMPBUTTON
 }
 
 #endif // wxUSE_BMPBUTTON

-