reset g_SelectionBeforePopup sooner in gtk_popup_hide_callback() to ensure that GetSe...

[wxWidgets.git] / include / wx / palmos / bmpbuttn.h

diff --git a/include/wx/palmos/bmpbuttn.h b/include/wx/palmos/bmpbuttn.h
index 0cdd4e03f3f9d83855d7cbc280a258e14167cf25..e24bfbb874e40d9590439dfb77a574b7ac7bbc4e 100644 (file)
--- a/include/wx/palmos/bmpbuttn.h
+++ b/include/wx/palmos/bmpbuttn.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.h
+// Name:        wx/palmos/bmpbuttn.h

 // Purpose:     wxBitmapButton class
 // Purpose:     wxBitmapButton class

-// 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
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 

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

 #include "wx/button.h"
 #include "wx/bitmap.h"
 
 #include "wx/button.h"
 #include "wx/bitmap.h"
 


@@ -49,14 +45,13 @@ public:
 
     // Implementation
     virtual void SetDefault();
 
     // Implementation
     virtual void SetDefault();

-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);

     virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
 
 protected:
     virtual wxSize DoGetBestSize() const;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };