Added some tentative wxMotif clipboard code; did some file formatting

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

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 5aa8a1b39a41b2e06c728f6d14930904dc1221c6..d3a164d27500d988b313ccf7488780c4da686f3f 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -2,13 +2,11 @@
 // Name:        control.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        control.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 


@@ -36,25 +34,22 @@ class wxControl: public wxWindow
 DECLARE_DYNAMIC_CLASS(wxControl)
 
 public:
 DECLARE_DYNAMIC_CLASS(wxControl)
 
 public:

-  // construction

   wxControl();
   wxControl( wxWindow *parent, wxWindowID id, 
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
       long style = 0, const wxString &name = wxPanelNameStr  );
   
   wxControl();
   wxControl( wxWindow *parent, wxWindowID id, 
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
       long style = 0, const wxString &name = wxPanelNameStr  );
   

-  // overridables

   virtual void Command( wxCommandEvent &event );
 
   virtual void Command( wxCommandEvent &event );
 

-  // accessors

     // this function will filter out '&' characters and will put the accelerator
     // char (the one immediately after '&') into m_chAccel (@@ not yet)
   virtual void SetLabel( const wxString &label );
   virtual wxString GetLabel() const;
     // this function will filter out '&' characters and will put the accelerator
     // char (the one immediately after '&') into m_chAccel (@@ not yet)
   virtual void SetLabel( const wxString &label );
   virtual wxString GetLabel() const;

-
+  

 protected:
   wxString   m_label;
 protected:
   wxString   m_label;

-  // when we implement keyboard interface we will make use of this, but not yet
-  //char       m_chAccel;
+  char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
+  

 };
 
 #endif // __GTKCONTROLH__
 };
 
 #endif // __GTKCONTROLH__