converted to 16 colors

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 35d5d8c4c3f51259478c287b146e084b5ce92599..0005193c7c6162489eeb53c00e6538226202a38f 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -16,11 +16,8 @@
     #pragma interface "control.h"
 #endif
 
     #pragma interface "control.h"
 #endif
 

-#include "wx/window.h"
-#include "wx/list.h"
-

 // General item class
 // General item class

-class WXDLLEXPORT wxControl : public wxWindow
+class WXDLLEXPORT wxControl : public wxControlBase

 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 


@@ -29,14 +26,14 @@ public:
    virtual ~wxControl();
 
    // Simulates an event
    virtual ~wxControl();
 
    // Simulates an event

-   bool Command(wxCommandEvent& event) { return ProcessCommand(event); }
+   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
+
+   // implementation from now on
+   // --------------------------

 
    // Calls the callback and appropriate event handlers
    bool ProcessCommand(wxCommandEvent& event);
 
 
    // Calls the callback and appropriate event handlers
    bool ProcessCommand(wxCommandEvent& event);
 

-   // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(int direction = wxHORIZONTAL);
-

    // MSW-specific
 #ifdef __WIN95__
    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
    // MSW-specific
 #ifdef __WIN95__
    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);


@@ -70,7 +67,17 @@ protected:
 
 protected:
    // For controls like radiobuttons which are really composite
 
 protected:
    // For controls like radiobuttons which are really composite

-   wxList           m_subControls;
+   wxList m_subControls;
+
+   virtual wxSize DoGetBestSize();
+
+   // create the control of the given class with the given style, returns FALSE
+   // if creation failed
+   bool MSWCreateControl(const wxChar *classname, WXDWORD style);
+
+   // determine the extended styles combination for this window (may slightly
+   // modify styl parameter)
+   WXDWORD GetExStyle(WXDWORD& style) const;

 
 private:
    DECLARE_EVENT_TABLE()
 
 private:
    DECLARE_EVENT_TABLE()


@@ -79,8 +86,8 @@ private:
 
 #if WXWIN_COMPATIBILITY
     inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
 
 #if WXWIN_COMPATIBILITY
     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 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 // WXWIN_COMPATIBILITY
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY