added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index d164e52485e7594fbd35c44240bb4d90f3881dff..84afdf5eaeb6856c08d4649c29230c150aff7ac6 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(__APPLE__)

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


@@ -20,60 +20,58 @@
 #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
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 // General item class
 class WXDLLEXPORT wxControl: public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)

-
+        

 public:
     wxControl();
     wxControl( wxWindow *parent,
 public:
     wxControl();
     wxControl( wxWindow *parent,

-               wxWindowID id,
-               const wxPoint &pos = wxDefaultPosition,
-               const wxSize &size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxControlNameStr )
+        wxWindowID id,
+        const wxPoint &pos = wxDefaultPosition,
+        const wxSize &size = wxDefaultSize,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString &name = wxControlNameStr )

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

-
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
-
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxControlNameStr);
+    

     // simulates the event, returns TRUE if the event was processed
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
     // simulates the event, returns TRUE if the event was processed
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }

-
+    

     // calls the callback and appropriate event handlers, returns TRUE if
     // event was processed
     virtual bool ProcessCommand(wxCommandEvent& event);
     // 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 ;
     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; }
     bool InSetValue() const { return m_inSetValue; }

-
+    

 protected:
 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);
+
+    // 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_
+