wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index eb9b852be1246cadc6c8287714bda662801e840d..9f3b15938bee6b031f6a1ece035579d4611b29ff 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
@@ -16,11 +16,8 @@
     #pragma interface "control.h"
 #endif
 
-#include "wx/window.h"
-#include "wx/list.h"
-
 // General item class
-class WXDLLEXPORT wxControl : public wxWindow
+class WXDLLEXPORT wxControl : public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
@@ -29,15 +26,26 @@ public:
    virtual ~wxControl();
 
    // Simulates an event
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
+   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
+
+   // implementation from now on
+   // --------------------------
+
    // Calls the callback and appropriate event handlers
-   virtual void ProcessCommand(wxCommandEvent& event); 
+   bool ProcessCommand(wxCommandEvent& event);
+
+   // MSW-specific
+#ifdef __WIN95__
+   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+#endif // Win95
+
+   // For ownerdraw items
+   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+   virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
-   virtual void SetClientSize(int width, int height);
-   virtual void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+   wxList& GetSubcontrols() { return m_subControls; }
 
-   virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel() const;
+   void OnEraseBackground(wxEraseEvent& event);
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
@@ -47,51 +55,53 @@ public:
    inline virtual void SetButtonFont(const wxFont& font);
    inline wxFont& GetLabelFont() const;
    inline wxFont& GetButtonFont() const;
-#endif
-
-   // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(int direction = wxHORIZONTAL);
 
    // Adds callback
    inline void Callback(const wxFunction function);
 
-   // MSW-specific
-   
-   // Window procedure
-   virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
-
-   void OnEraseBackground(wxEraseEvent& event);
-
-   // For ownerdraw items
-   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-   virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-
    wxFunction GetCallback() { return m_callback; }
-   wxList& GetSubcontrols() { return m_subControls; }
 
 protected:
    wxFunction       m_callback;     // Callback associated with the window
- 
-   // MSW implementation
-   wxList           m_subControls; // For controls like radiobuttons which are really composite
+#endif // WXWIN_COMPATIBILITY
+
+protected:
+   // For controls like radiobuttons which are really composite
+   wxList m_subControls;
+
+   virtual wxSize DoGetBestSize();
+
+   // create the control of the given class with the given style, returns FALSE
+   // if creation failed
+   //
+   // All parameters except classname and style are optional, if the
+   // size/position are not given, they should be set later with SetSize() and,
+   // label (the title of the window), of course, is left empty. The extended
+   // style is determined from the style and the app 3D settings automatically
+   // if it's not specified explicitly.
+   bool MSWCreateControl(const wxChar *classname,
+                         WXDWORD style,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& size = wxDefaultSize,
+                         const wxString& label = wxEmptyString,
+                         WXDWORD exstyle = (WXDWORD)-1);
+
+   // determine the extended styles combination for this window (may slightly
+   // modify style parameter, this is why it's non const)
+   WXDWORD GetExStyle(WXDWORD& style, bool *want3D) const;
 
 private:
    DECLARE_EVENT_TABLE()
 };
 
-// Adds callback
-inline void wxControl::Callback(const wxFunction function)
-{
-    m_callback = function;
-};
 
 #if WXWIN_COMPATIBILITY
-    inline wxFont& wxControl::GetLabelFont() const { return GetFont() ; }
-    inline wxFont& wxControl::GetButtonFont() const { return GetFont() ; }
+    inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
+    inline wxFont& wxControl::GetLabelFont() const { return GetFont(); }
+    inline wxFont& wxControl::GetButtonFont() const { return GetFont(); }
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
-#endif
+#endif // WXWIN_COMPATIBILITY
 
 #endif
     // _WX_CONTROL_H_