implemented nested index entries and index entries pointing to multiple documents...

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index b02955663264acf05d5d03818dbb949a6e9faf06..9fde5ab45423864f8d5aa55060333d84afac4cec 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "control.h"
 #endif
 
 #pragma interface "control.h"
 #endif
 


@@ -20,8 +20,6 @@
 #include "wx/list.h"
 #include "wx/validate.h"
 
 #include "wx/list.h"
 #include "wx/validate.h"
 

-#define wxControlNameStr _T("control")
-

 // General item class
 class WXDLLEXPORT wxControl: public wxControlBase
 {
 // General item class
 class WXDLLEXPORT wxControl: public wxControlBase
 {


@@ -46,34 +44,37 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxControlNameStr);
     
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxControlNameStr);
     

-    // simulates the event, returns TRUE if the event was processed
+    // simulates the event, returns true if the event was processed

     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
     
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
     

-    // calls the callback and appropriate event handlers, returns TRUE if
+    // calls the callback and appropriate event handlers, returns true if

     // event was processed
     virtual bool ProcessCommand(wxCommandEvent& event);
     
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel() const ;
     
     // event was processed
     virtual bool ProcessCommand(wxCommandEvent& event);
     
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel() const ;
     

-#if WXWIN_COMPATIBILITY
-    void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
-    
-    wxFunction GetCallback() { return m_callback; }
-#endif // WXWIN_COMPATIBILITY
-    

     bool InSetValue() const { return m_inSetValue; }
     
 protected:
     bool InSetValue() const { return m_inSetValue; }
     
 protected:

-#if WXWIN_COMPATIBILITY
-    wxFunction          m_callback;     // Callback associated with the window
-#endif // WXWIN_COMPATIBILITY
-    
-    bool                m_inSetValue;   // Motif: prevent callbacks being called while
-    // in SetValue
+    // calls wxControlBase::CreateControl, also sets foreground, background and
+    // font to parent's values
+    bool CreateControl(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name);
+
+    // native implementation using XtQueryGeometry
+    virtual wxSize DoGetBestSize() const;
+
+    // Motif: prevent callbacks being called while in SetValue
+    bool m_inSetValue;

     
     DECLARE_EVENT_TABLE()
 };
 
     
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-// _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_
+