Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / gtk / button.h

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 7d1e5847a1afc79be2435897c37246243272a77d..9e7a57d8906cf617003e9dcbd6a5f7b136ca85d7 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/button.h
 // Purpose:     wxGTK wxButton class declaration
 // Author:      Robert Roebling
 // Name:        wx/gtk/button.h
 // Purpose:     wxGTK wxButton class declaration
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,7 +16,7 @@
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:

-    wxButton() { Init(); }
+    wxButton() {}

     wxButton(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
     wxButton(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,


@@ -25,8 +24,6 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {

-        Init();
-

         Create(parent, id, label, pos, size, style, validator, name);
     }
 
         Create(parent, id, label, pos, size, style, validator, name);
     }
 


@@ -39,7 +36,6 @@ public:
 
     virtual wxWindow *SetDefault();
     virtual void SetLabel( const wxString &label );
 
     virtual wxWindow *SetDefault();
     virtual void SetLabel( const wxString &label );

-    virtual bool Enable( bool enable = true );

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -61,46 +57,15 @@ protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 

-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
-
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapPosition(wxDirection dir);
+#if wxUSE_MARKUP
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP

 
 private:
     typedef wxButtonBase base_type;
 
 
 private:
     typedef wxButtonBase base_type;
 

-    // common part of all ctors
-    void Init()
-    {
-        m_isCurrent =
-        m_isPressed = false;
-    }
-
-    // focus event handler: calls GTKUpdateBitmap()
-    void GTKOnFocus(wxFocusEvent& event);
-
-    // update the bitmap to correspond to the current button state
-    void GTKUpdateBitmap();
-
-    // return the current button state from m_isXXX flags (which means that it
-    // might not correspond to the real current state as e.g. m_isCurrent will
-    // never be true if we don't have a valid current bitmap)
-    State GTKGetCurrentState() const;
-
-    // show the given bitmap (must be valid)
-    void GTKDoShowBitmap(const wxBitmap& bitmap);
-
-    // the bitmaps for the different state of the buttons, all of them may be
-    // invalid and the button only shows a bitmap at all if State_Normal bitmap
-    // is valid
-    wxBitmap m_bitmaps[State_Max];
-
-    // true iff mouse is currently over the button
-    bool m_isCurrent;
-
-    // true iff the button is in pressed state
-    bool m_isPressed;
+    // Return the GtkLabel used by this button.
+    GtkLabel *GTKGetLabel() const;

 
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxButton)
 };