2006-09-13 MorganL <morlmor@yahoo.com>

        Reviewed/landed by aroben.

        Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=10833
        Windows build needs fixed after move to engine-rendered file upload widget

        * WebCore.vcproj/WebCore/WebCore.vcproj: Add RenderFileUpload files,
        remove RenderFileButton files
        * platform/win/TemporaryLinkStubs.cpp: Add stubs for FileChooser, Icon
        (FileChooser::FileChooser):
        (FileChooser::~FileChooser):
        (FileChooser::openFileChooser):
        (FileChooser::basenameForWidth):
        (FileChooser::uploadControlDetaching):
        (FileChooser::chooseFile):
        (WebCore::fileButtonChooseFileLabel):
        (WebCore::fileButtonNoFileSelectedLabel):
        (Icon::Icon):
        (Icon::~Icon):
        (Icon::newIconForFile):
        (Icon::paint):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b6ddab5a56a4a1f14f941a585cb0c96f7a33eac..9bc03744111fd9be3263a404f828029855aae3d4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2006-09-13  MorganL  <morlmor@yahoo.com>
+
+        Reviewed/landed by aroben.
+
+        Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=10833
+        Windows build needs fixed after move to engine-rendered file upload widget
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj: Add RenderFileUpload files,
+        remove RenderFileButton files
+        * platform/win/TemporaryLinkStubs.cpp: Add stubs for FileChooser, Icon
+        (FileChooser::FileChooser):
+        (FileChooser::~FileChooser):
+        (FileChooser::openFileChooser):
+        (FileChooser::basenameForWidth):
+        (FileChooser::uploadControlDetaching):
+        (FileChooser::chooseFile):
+        (WebCore::fileButtonChooseFileLabel):
+        (WebCore::fileButtonNoFileSelectedLabel):
+        (Icon::Icon):
+        (Icon::~Icon):
+        (Icon::newIconForFile):
+        (Icon::paint):
+
 2006-09-13  MorganL  <morlmor@yahoo.com>
 
         Reviewed/landed by aroben.

diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index 784a64b026f2255e8cc286ba9da906d5b13051ab..70dfdd21abe3963d8475d14041c7fbf6aa449f1c 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -2991,11 +2991,11 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rendering\RenderFileButton.cpp"
+                               RelativePath="..\..\rendering\RenderFileUploadControl.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rendering\RenderFileButton.h"
+                               RelativePath="..\..\rendering\RenderFileUploadControl.h"
                                >
                        </File>
                        <File

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index 130fcc29cea49f631846bc069f90d62b4766935f..03ad24864213a595f4580870504c81d00772ebae 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -33,8 +33,8 @@
 #include "CString.h"
 #include "Node.h"
 #include "TextField.h"
+#include "FileChooser.h"
 #include "Font.h"
-#include "FileButton.h"
 #include "PopUpButton.h"
 #include "IntPoint.h"
 #include "Widget.h"
@@ -64,6 +64,7 @@
 #include "AXObjectCache.h"
 #include "RenderPopupMenuWin.h"
 #include "EditCommand.h"
+#include "Icon.h"
 
 using namespace WebCore;
 
@@ -118,15 +119,12 @@ void ListBox::setEnabled(bool) { notImplemented(); }
 void ListBox::clear() { notImplemented(); }
 bool ListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
 
-FileButton::FileButton(Frame*) { notImplemented(); }
-void FileButton::click(bool) { notImplemented(); }
-IntSize FileButton::sizeForCharacterWidth(int) const { notImplemented(); return IntSize(); }
-Widget::FocusPolicy FileButton::focusPolicy() const { notImplemented(); return NoFocus; }
-WebCore::IntRect FileButton::frameGeometry() const { notImplemented(); return IntRect(); }
-void FileButton::setFilename(DeprecatedString const&) { notImplemented(); }
-int FileButton::baselinePosition(int) const { notImplemented(); return 0; }
-void FileButton::setFrameGeometry(WebCore::IntRect const&) { notImplemented(); }
-void FileButton::setDisabled(bool) { notImplemented(); }
+FileChooser::FileChooser(Document*, RenderFileUploadControl*) { notImplemented(); }
+FileChooser::~FileChooser() { notImplemented(); }
+void FileChooser::openFileChooser() { notImplemented(); }
+String FileChooser::basenameForWidth(int width) const { notImplemented(); return String(); }
+void FileChooser::uploadControlDetaching() { notImplemented(); }
+void FileChooser::chooseFile(const String& filename) { notImplemented(); }
 
 Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }
 Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }
@@ -208,6 +206,9 @@ bool WebCore::historyContains(DeprecatedString const&) { return false; }
 String WebCore::submitButtonDefaultLabel() { return "Submit"; }
 String WebCore::inputElementAltText() { return DeprecatedString(); }
 String WebCore::resetButtonDefaultLabel() { return "Reset"; }
+String WebCore::fileButtonChooseFileLabel() { return "Browse..."; }
+String WebCore::fileButtonNoFileSelectedLabel() { return String(); }
+
 String WebCore::defaultLanguage() { return "en"; }
 
 void WebCore::findWordBoundary(UChar const* str,int len,int position,int* start, int* end) {*start=position; *end=position; }
@@ -372,3 +373,8 @@ void RenderPopupMenuWin::addOption(HTMLOptionElement*) { notImplemented(); }
 void RenderThemeWin::systemFont(int propId, FontDescription& fontDescription) const {}
 bool RenderThemeWin::paintMenuList(RenderObject *, const RenderObject::PaintInfo&, const IntRect&) { return false; }
 void RenderThemeWin::adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const { }
+
+Icon::Icon() { notImplemented(); }
+Icon::~Icon() { notImplemented(); }
+PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
+void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
\ No newline at end of file