X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/341c92a8b4c813cbfb606687937dcdf5d8c3c2fe..83f96286bb4ef34147d7f467a0f0a4a4fc27af2d:/include/wx/msw/control.h?ds=inline

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index eb9b852be1..9ecbab3dfb 100644
--- 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,82 +16,115 @@
     #pragma interface "control.h"
 #endif
 
-#include "wx/window.h"
-#include "wx/list.h"
+#include "wx/dynarray.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 
 // General item class
-class WXDLLEXPORT wxControl : public wxWindow
+class WXDLLEXPORT wxControl : public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 public:
    wxControl();
-   virtual ~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)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
 
-   // Simulates an event
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-   // Calls the callback and appropriate event handlers
-   virtual void ProcessCommand(wxCommandEvent& event); 
+    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);
 
-   virtual void SetClientSize(int width, int height);
-   virtual void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+    virtual ~wxControl();
 
-   virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel() const;
+    // Simulates an event
+    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
-#if WXWIN_COMPATIBILITY
-   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   wxColour* GetButtonColour() const { return NULL; }
+    // implementation from now on
+    // --------------------------
 
-   inline virtual void SetLabelFont(const wxFont& font);
-   inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont& GetLabelFont() const;
-   inline wxFont& GetButtonFont() const;
-#endif
+    // Calls the callback and appropriate event handlers
+    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; };
+
+    wxArrayLong GetSubcontrols() { return m_subControls; }
 
-   // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(int direction = wxHORIZONTAL);
+    void OnEraseBackground(wxEraseEvent& event);
 
-   // Adds callback
-   inline void Callback(const wxFunction function);
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
-   // MSW-specific
-   
-   // Window procedure
-   virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
+#if WXWIN_COMPATIBILITY
+    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
+    wxColour* GetButtonColour() const { return NULL; }
+
+    inline virtual void SetLabelFont(const wxFont& font);
+    inline virtual void SetButtonFont(const wxFont& font);
+    inline wxFont& GetLabelFont() const;
+    inline wxFont& GetButtonFont() const;
 
-   void OnEraseBackground(wxEraseEvent& event);
+    // Adds callback
+    inline void Callback(const wxFunction function);
 
-   // For ownerdraw items
-   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-   virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+    wxFunction GetCallback() { return m_callback; }
 
-   wxFunction GetCallback() { return m_callback; }
-   wxList& GetSubcontrols() { return m_subControls; }
+protected:
+    wxFunction       m_callback;     // Callback associated with the window
+#endif // WXWIN_COMPATIBILITY
 
 protected:
-   wxFunction       m_callback;     // Callback associated with the window
- 
-   // MSW implementation
-   wxList           m_subControls; // For controls like radiobuttons which are really composite
+    // for controls like radiobuttons which are really composite this array
+    // holds the ids (not HWNDs!) of the sub controls
+    wxArrayLong m_subControls;
+
+    virtual wxSize DoGetBestSize() const;
+
+    // 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()
+    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 (wxFont &)GetFont(); }
+    inline wxFont& wxControl::GetButtonFont() const { return (wxFont &)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_