Some work on tabbing and menu accels,

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index bcb31a9e908ce4255944a83adf008a96a19041b9..dfcf70ce732b326e135f83cc42aac2e9f768cfe2 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -16,9 +16,14 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_BMPBUTTON
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"

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

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -30,46 +35,67 @@ class wxBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;

 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 

-class wxBitmapButton: public wxControl
+class wxBitmapButton: public wxButton

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-
-  public:
-
-    wxBitmapButton(void);
-    inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
+public:
+    wxBitmapButton();
+    inline wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                         const wxValidator& validator = wxDefaultValidator,
+                         const wxString& name = wxButtonNameStr )

     {
     {

-      Create(parent, id, bitmap, pos, size, style, validator, name);
+        Create(parent, id, bitmap, pos, size, style, validator, name);

     }
     }

-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
-    void SetDefault(void);
+    bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxButtonNameStr);
+    virtual void SetDefault();
+    

     void SetLabel( const wxString &label );
     void SetLabel( const wxString &label );

-    wxString GetLabel(void) const;
-    virtual void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); }
-    virtual void SetBitmapLabel( const wxBitmap& bitmap );
-    wxBitmap& GetBitmapLabel(void) const { return (wxBitmap&) m_bitmap; }
+    wxString GetLabel() const;
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
+    
+    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
+    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
+    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
+    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
+    
+    void SetBitmapDisabled( const wxBitmap& bitmap );
+    void SetBitmapFocus( const wxBitmap& bitmap );
+    void SetBitmapLabel( const wxBitmap& bitmap );
+    void SetBitmapSelected( const wxBitmap& bitmap );

     
     

-  // implementation
+    virtual bool Enable(bool enable);

   
   

+// implementation
+
+    void HasFocus();
+    void NotFocus();
+    void StartSelect();
+    void EndSelect();
+    void SetBitmap();

     void ApplyWidgetStyle();    
     void ApplyWidgetStyle();    

-    
-  public:

   
   

-    wxBitmap   m_bitmap;    
-    
+    bool         m_hasFocus;
+    bool         m_isSelected;
+    wxBitmap     m_bitmap; 
+    wxBitmap     m_disabled;
+    wxBitmap     m_focus;
+    wxBitmap     m_selected;   
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)

 };
 };

+
+#endif
+

 #endif // __BMPBUTTONH__
 #endif // __BMPBUTTONH__