Fixed OS/2 compilation problems.

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 0819a8a478c55ef76b7e5d88f7237dae3539c1c2..dc66995be7e478f7e89a791b602cd30a38df1d14 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -18,8 +18,6 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
-

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


@@ -30,9 +28,7 @@ public:
    wxControl(wxWindow *parent, wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
    wxControl(wxWindow *parent, wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,

-#if wxUSE_VALIDATORS

              const wxValidator& validator = wxDefaultValidator,
              const wxValidator& validator = wxDefaultValidator,

-#endif

              const wxString& name = wxControlNameStr)
     {
         Create(parent, id, pos, size, style, validator, name);
              const wxString& name = wxControlNameStr)
     {
         Create(parent, id, pos, size, style, validator, name);


@@ -41,9 +37,7 @@ public:
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,

-#if wxUSE_VALIDATORS

             const wxValidator& validator = wxDefaultValidator,
             const wxValidator& validator = wxDefaultValidator,

-#endif

             const wxString& name = wxControlNameStr);
 
     virtual ~wxControl();
             const wxString& name = wxControlNameStr);
 
     virtual ~wxControl();


@@ -98,20 +92,21 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

-    // create the control of the given class with the given style, returns FALSE
-    // if creation failed
+    // create the control of the given class with the given style (combination
+    // of WS_XXX flags, i.e. Windows style, not wxWindows one), returns
+    // FALSE if creation failed

     //
     // All parameters except classname and style are optional, if the
     //
     // 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.
+    // 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,
     bool MSWCreateControl(const wxChar *classname,

-            WXDWORD style,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            const wxString& label = wxEmptyString,
-            WXDWORD exstyle = (WXDWORD)-1);
+                          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)
 
     // determine the extended styles combination for this window (may slightly
     // modify style parameter, this is why it's non const)


@@ -124,8 +119,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 (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 // WXWIN_COMPATIBILITY
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY